gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-26 12:18:51 -05:00
Code Issues Projects Releases Wiki Activity

...and the other half of making it const.

Browse Source
This commit is contained in:
Camilla Berglund 2012-12-02 21:18:01 +01:00
parent e38b752465
commit b30def90e4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/monitor.c
View File

@ -238,7 +238,7 @@ void _glfwSplitBPP(int bpp, int* red, int* green, int* blue)
// Return the currently connected monitors // Return the currently connected monitors
//======================================================================== //========================================================================
GLFWAPI GLFWmonitor* glfwGetMonitors(int* count) GLFWAPI const GLFWmonitor* glfwGetMonitors(int* count)
{ {
if (!_glfwInitialized) if (!_glfwInitialized)
{ {
@ -375,7 +375,7 @@ GLFWAPI void glfwSetMonitorCallback(GLFWmonitorfun cbfun)
// Get a list of available video modes // Get a list of available video modes
//======================================================================== //========================================================================
GLFWAPI GLFWvidmode* glfwGetVideoModes(GLFWmonitor handle, int* count) GLFWAPI const GLFWvidmode* glfwGetVideoModes(GLFWmonitor handle, int* count)
{ {
_GLFWmonitor* monitor = (_GLFWmonitor*) handle; _GLFWmonitor* monitor = (_GLFWmonitor*) handle;

10
tests/modes.c
View File

@ -49,7 +49,7 @@ static void usage(void)
printf(" modes -h\n"); printf(" modes -h\n");
} }
static const char* format_mode(GLFWvidmode* mode) static const char* format_mode(const GLFWvidmode* mode)
{ {
static char buffer[512]; static char buffer[512];
@ -94,7 +94,7 @@ static void list_modes(GLFWmonitor monitor)
{ {
int count, widthMM, heightMM, dpi, i; int count, widthMM, heightMM, dpi, i;
GLFWvidmode mode; GLFWvidmode mode;
GLFWvidmode* modes = glfwGetVideoModes(monitor, &count); const GLFWvidmode* modes = glfwGetVideoModes(monitor, &count);
glfwGetVideoMode(monitor, &mode); glfwGetVideoMode(monitor, &mode);
@ -125,11 +125,11 @@ static void list_modes(GLFWmonitor monitor)
static void test_modes(GLFWmonitor monitor) static void test_modes(GLFWmonitor monitor)
{ {
int i, count; int i, count;
GLFWvidmode* modes = glfwGetVideoModes(monitor, &count); const GLFWvidmode* modes = glfwGetVideoModes(monitor, &count);
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
GLFWvidmode* mode = modes + i; const GLFWvidmode* mode = modes + i;
GLFWvidmode current; GLFWvidmode current;
glfwWindowHint(GLFW_RED_BITS, mode->redBits); glfwWindowHint(GLFW_RED_BITS, mode->redBits);
@ -210,7 +210,7 @@ static void test_modes(GLFWmonitor monitor)
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
int ch, i, count, mode = LIST_MODE; int ch, i, count, mode = LIST_MODE;
GLFWmonitor* monitors; const GLFWmonitor* monitors;
while ((ch = getopt(argc, argv, "th")) != -1) while ((ch = getopt(argc, argv, "th")) != -1)
{ {