Merge git://github.com/raedwulf/glfw

This commit is contained in:
Camilla Berglund 2011-09-25 16:10:06 +02:00
commit 41fe14b5f8
3 changed files with 3 additions and 0 deletions

View File

@ -228,6 +228,7 @@ int _glfwPlatformInit(void)
// Save the original gamma ramp
_glfwLibrary.originalRampSize = CGDisplayGammaTableCapacity(CGMainDisplayID());
_glfwPlatformGetGammaRamp(&_glfwLibrary.originalRamp);
_glfwLibrary.currentRamp = _glfwLibrary.originalRamp;
return GL_TRUE;
}

View File

@ -163,6 +163,7 @@ int _glfwPlatformInit(void)
// Save the original gamma ramp
_glfwLibrary.originalRampSize = 256;
_glfwPlatformGetGammaRamp(&_glfwLibrary.originalRamp);
_glfwLibrary.currentRamp = _glfwLibrary.originalRamp;
_glfwInitTimer();

View File

@ -502,6 +502,7 @@ static void initGammaRamp(void)
// Save the original gamma ramp
_glfwPlatformGetGammaRamp(&_glfwLibrary.originalRamp);
_glfwLibrary.currentRamp = _glfwLibrary.originalRamp;
}