From 562242f3e258cc5263230358dc226445693da8f4 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Fri, 15 Oct 2010 13:42:12 +0200 Subject: [PATCH 1/2] Added stubs for Cocoa implementation of gamma ramp API. --- src/cocoa/CMakeLists.txt | 1 + src/cocoa/cocoa_gamma.m | 56 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 src/cocoa/cocoa_gamma.m diff --git a/src/cocoa/CMakeLists.txt b/src/cocoa/CMakeLists.txt index 37c3b0a8..d8758ab6 100644 --- a/src/cocoa/CMakeLists.txt +++ b/src/cocoa/CMakeLists.txt @@ -11,6 +11,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} set(cocoa_SOURCES cocoa_enable.m cocoa_fullscreen.m + cocoa_gamma.m cocoa_glext.m cocoa_init.m cocoa_joystick.m diff --git a/src/cocoa/cocoa_gamma.m b/src/cocoa/cocoa_gamma.m new file mode 100644 index 00000000..e7bf6cf6 --- /dev/null +++ b/src/cocoa/cocoa_gamma.m @@ -0,0 +1,56 @@ +//======================================================================== +// GLFW - An OpenGL framework +// Platform: Cocoa/NSOpenGL +// API version: 3.0 +// WWW: http://www.glfw.org/ +//------------------------------------------------------------------------ +// Copyright (c) 2010 Camilla Berglund +// +// This software is provided 'as-is', without any express or implied +// warranty. In no event will the authors be held liable for any damages +// arising from the use of this software. +// +// Permission is granted to anyone to use this software for any purpose, +// including commercial applications, and to alter it and redistribute it +// freely, subject to the following restrictions: +// +// 1. The origin of this software must not be misrepresented; you must not +// claim that you wrote the original software. If you use this software +// in a product, an acknowledgment in the product documentation would +// be appreciated but is not required. +// +// 2. Altered source versions must be plainly marked as such, and must not +// be misrepresented as being the original software. +// +// 3. This notice may not be removed or altered from any source +// distribution. +// +//======================================================================== + +#include "internal.h" + +#include +#include + + +//************************************************************************ +//**** GLFW internal functions **** +//************************************************************************ + +//======================================================================== +// Save the original gamma ramp so that we can restore it later +//======================================================================== + +void _glfwPlatformGetGammaRamp(GLFWgammaramp* ramp) +{ +} + + +//======================================================================== +// Make the specified gamma ramp current +//======================================================================== + +void _glfwPlatformSetGammaRamp(const GLFWgammaramp* ramp) +{ +} + From 3e6d00a0e0663c1cfc505420ae7fd7639f5363d9 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Wed, 27 Oct 2010 14:13:24 +0200 Subject: [PATCH 2/2] Disabled inclusion of Apple's legacy glext.h header. --- include/GL/glfw3.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/GL/glfw3.h b/include/GL/glfw3.h index e2316413..50393a7a 100644 --- a/include/GL/glfw3.h +++ b/include/GL/glfw3.h @@ -154,6 +154,7 @@ extern "C" { * (which is not a nice solution for portable programs). */ #if defined(__APPLE_CC__) + #define GL_GLEXT_LEGACY #include #ifndef GLFW_NO_GLU #include