diff --git a/src/win32_opengl.c b/src/win32_opengl.c index 1a7faa05..0ffd594c 100644 --- a/src/win32_opengl.c +++ b/src/win32_opengl.c @@ -68,7 +68,7 @@ void _glfwPlatformSwapInterval(int interval) { _GLFWwindow* window = _glfwLibrary.currentWindow; - if (window->WGL.has_WGL_EXT_swap_control) + if (window->WGL.EXT_swap_control) window->WGL.SwapIntervalEXT(interval); } diff --git a/src/win32_platform.h b/src/win32_platform.h index 2ff73116..15bb1212 100644 --- a/src/win32_platform.h +++ b/src/win32_platform.h @@ -229,13 +229,13 @@ typedef struct _GLFWcontextWGL PFNWGLGETEXTENSIONSSTRINGEXTPROC GetExtensionsStringEXT; PFNWGLGETEXTENSIONSSTRINGARBPROC GetExtensionsStringARB; PFNWGLCREATECONTEXTATTRIBSARBPROC CreateContextAttribsARB; - GLboolean has_WGL_EXT_swap_control; - GLboolean has_WGL_ARB_multisample; - GLboolean has_WGL_ARB_pixel_format; - GLboolean has_WGL_ARB_create_context; - GLboolean has_WGL_ARB_create_context_profile; - GLboolean has_WGL_EXT_create_context_es2_profile; - GLboolean has_WGL_ARB_create_context_robustness; + GLboolean EXT_swap_control; + GLboolean ARB_multisample; + GLboolean ARB_pixel_format; + GLboolean ARB_create_context; + GLboolean ARB_create_context_profile; + GLboolean EXT_create_context_es2_profile; + GLboolean ARB_create_context_robustness; } _GLFWcontextWGL; diff --git a/src/win32_window.c b/src/win32_window.c index 3ea60ac4..d3e071f8 100644 --- a/src/win32_window.c +++ b/src/win32_window.c @@ -179,7 +179,7 @@ static _GLFWfbconfig* getFBConfigs(_GLFWwindow* window, unsigned int* found) *found = 0; - if (window->WGL.has_WGL_ARB_pixel_format) + if (window->WGL.ARB_pixel_format) count = getPixelFormatAttrib(window, 1, WGL_NUMBER_PIXEL_FORMATS_ARB); else { @@ -205,7 +205,7 @@ static _GLFWfbconfig* getFBConfigs(_GLFWwindow* window, unsigned int* found) for (i = 1; i <= count; i++) { - if (window->WGL.has_WGL_ARB_pixel_format) + if (window->WGL.ARB_pixel_format) { // Get pixel format attributes through WGL_ARB_pixel_format if (!getPixelFormatAttrib(window, i, WGL_SUPPORT_OPENGL_ARB) || @@ -255,7 +255,7 @@ static _GLFWfbconfig* getFBConfigs(_GLFWwindow* window, unsigned int* found) result[*found].stereo = getPixelFormatAttrib(window, i, WGL_STEREO_ARB); - if (window->WGL.has_WGL_ARB_multisample) + if (window->WGL.ARB_multisample) { result[*found].samples = getPixelFormatAttrib(window, i, WGL_SAMPLES_ARB); @@ -349,7 +349,7 @@ static GLboolean createContext(_GLFWwindow* window, return GL_FALSE; } - if (window->WGL.has_WGL_ARB_create_context) + if (window->WGL.ARB_create_context) { // Use the newer wglCreateContextAttribsARB creation method @@ -384,7 +384,7 @@ static GLboolean createContext(_GLFWwindow* window, { int flags = 0; - if (!window->WGL.has_WGL_ARB_create_context_profile) + if (!window->WGL.ARB_create_context_profile) { _glfwSetError(GLFW_VERSION_UNAVAILABLE, "Win32/WGL: OpenGL profile requested but " @@ -393,7 +393,7 @@ static GLboolean createContext(_GLFWwindow* window, } if (wndconfig->glProfile == GLFW_OPENGL_ES2_PROFILE && - !window->WGL.has_WGL_EXT_create_context_es2_profile) + !window->WGL.EXT_create_context_es2_profile) { _glfwSetError(GLFW_VERSION_UNAVAILABLE, "Win32/WGL: OpenGL ES 2.x profile requested but " @@ -416,7 +416,7 @@ static GLboolean createContext(_GLFWwindow* window, { int strategy; - if (!window->WGL.has_WGL_ARB_create_context_robustness) + if (!window->WGL.ARB_create_context_robustness) { _glfwSetError(GLFW_VERSION_UNAVAILABLE, "Win32/WGL: An OpenGL robustness strategy was " @@ -1111,13 +1111,13 @@ static void initWGLExtensions(_GLFWwindow* window) // This needs to include every extension used below except for // WGL_ARB_extensions_string and WGL_EXT_extensions_string - window->WGL.has_WGL_ARB_multisample = GL_FALSE; - window->WGL.has_WGL_ARB_create_context = GL_FALSE; - window->WGL.has_WGL_ARB_create_context_profile = GL_FALSE; - window->WGL.has_WGL_EXT_create_context_es2_profile = GL_FALSE; - window->WGL.has_WGL_ARB_create_context_robustness = GL_FALSE; - window->WGL.has_WGL_EXT_swap_control = GL_FALSE; - window->WGL.has_WGL_ARB_pixel_format = GL_FALSE; + window->WGL.ARB_multisample = GL_FALSE; + window->WGL.ARB_create_context = GL_FALSE; + window->WGL.ARB_create_context_profile = GL_FALSE; + window->WGL.EXT_create_context_es2_profile = GL_FALSE; + window->WGL.ARB_create_context_robustness = GL_FALSE; + window->WGL.EXT_swap_control = GL_FALSE; + window->WGL.ARB_pixel_format = GL_FALSE; window->WGL.GetExtensionsStringEXT = (PFNWGLGETEXTENSIONSSTRINGEXTPROC) wglGetProcAddress("wglGetExtensionsStringEXT"); @@ -1130,7 +1130,7 @@ static void initWGLExtensions(_GLFWwindow* window) } if (_glfwPlatformExtensionSupported("WGL_ARB_multisample")) - window->WGL.has_WGL_ARB_multisample = GL_TRUE; + window->WGL.ARB_multisample = GL_TRUE; if (_glfwPlatformExtensionSupported("WGL_ARB_create_context")) { @@ -1138,26 +1138,26 @@ static void initWGLExtensions(_GLFWwindow* window) wglGetProcAddress("wglCreateContextAttribsARB"); if (window->WGL.CreateContextAttribsARB) - window->WGL.has_WGL_ARB_create_context = GL_TRUE; + window->WGL.ARB_create_context = GL_TRUE; } - if (window->WGL.has_WGL_ARB_create_context) + if (window->WGL.ARB_create_context) { if (_glfwPlatformExtensionSupported("WGL_ARB_create_context_profile")) - window->WGL.has_WGL_ARB_create_context_profile = GL_TRUE; + window->WGL.ARB_create_context_profile = GL_TRUE; } - if (window->WGL.has_WGL_ARB_create_context && - window->WGL.has_WGL_ARB_create_context_profile) + if (window->WGL.ARB_create_context && + window->WGL.ARB_create_context_profile) { if (_glfwPlatformExtensionSupported("WGL_EXT_create_context_es2_profile")) - window->WGL.has_WGL_EXT_create_context_es2_profile = GL_TRUE; + window->WGL.EXT_create_context_es2_profile = GL_TRUE; } - if (window->WGL.has_WGL_ARB_create_context) + if (window->WGL.ARB_create_context) { if (_glfwPlatformExtensionSupported("WGL_ARB_create_context_robustness")) - window->WGL.has_WGL_ARB_create_context_robustness = GL_TRUE; + window->WGL.ARB_create_context_robustness = GL_TRUE; } if (_glfwPlatformExtensionSupported("WGL_EXT_swap_control")) @@ -1166,7 +1166,7 @@ static void initWGLExtensions(_GLFWwindow* window) wglGetProcAddress("wglSwapIntervalEXT"); if (window->WGL.SwapIntervalEXT) - window->WGL.has_WGL_EXT_swap_control = GL_TRUE; + window->WGL.EXT_swap_control = GL_TRUE; } if (_glfwPlatformExtensionSupported("WGL_ARB_pixel_format")) @@ -1175,7 +1175,7 @@ static void initWGLExtensions(_GLFWwindow* window) wglGetProcAddress("wglGetPixelFormatAttribivARB"); if (window->WGL.GetPixelFormatAttribivARB) - window->WGL.has_WGL_ARB_pixel_format = GL_TRUE; + window->WGL.ARB_pixel_format = GL_TRUE; } } @@ -1444,13 +1444,13 @@ int _glfwPlatformOpenWindow(_GLFWwindow* window, if (wndconfig->glMajor != 1 || wndconfig->glMinor != 0) { - if (window->WGL.has_WGL_ARB_create_context) + if (window->WGL.ARB_create_context) recreateContext = GL_TRUE; } if (wndconfig->glForward || wndconfig->glDebug) { - if (!window->WGL.has_WGL_ARB_create_context) + if (!window->WGL.ARB_create_context) { _glfwSetError(GLFW_VERSION_UNAVAILABLE, "Win32/WGL: A forward compatible or debug OpenGL " @@ -1464,7 +1464,7 @@ int _glfwPlatformOpenWindow(_GLFWwindow* window, if (wndconfig->glProfile) { - if (!window->WGL.has_WGL_ARB_create_context_profile) + if (!window->WGL.ARB_create_context_profile) { _glfwSetError(GLFW_VERSION_UNAVAILABLE, "Win32/WGL: OpenGL profile requested but " @@ -1480,7 +1480,7 @@ int _glfwPlatformOpenWindow(_GLFWwindow* window, // We want FSAA, but can we get it? // FSAA is not a hard constraint, so otherwise we just don't care - if (window->WGL.has_WGL_ARB_multisample && window->WGL.has_WGL_ARB_pixel_format) + if (window->WGL.ARB_multisample && window->WGL.ARB_pixel_format) { // We appear to have both the FSAA extension and the means to ask for it recreateContext = GL_TRUE; @@ -1658,7 +1658,7 @@ void _glfwPlatformRefreshWindowParams(void) // Obtain a detailed description of current pixel format pixelFormat = _glfw_GetPixelFormat(window->WGL.DC); - if (window->WGL.has_WGL_ARB_pixel_format) + if (window->WGL.ARB_pixel_format) { if (getPixelFormatAttrib(window, pixelFormat, WGL_ACCELERATION_ARB) != WGL_NO_ACCELERATION_ARB) @@ -1696,7 +1696,7 @@ void _glfwPlatformRefreshWindowParams(void) window->stereo = getPixelFormatAttrib(window, pixelFormat, WGL_STEREO_ARB) ? GL_TRUE : GL_FALSE; - if (window->WGL.has_WGL_ARB_multisample) + if (window->WGL.ARB_multisample) { window->samples = getPixelFormatAttrib(window, pixelFormat, WGL_SAMPLES_ARB); diff --git a/src/x11_opengl.c b/src/x11_opengl.c index 4075a7c0..7bee9d13 100644 --- a/src/x11_opengl.c +++ b/src/x11_opengl.c @@ -92,13 +92,13 @@ void _glfwPlatformSwapInterval(int interval) { _GLFWwindow* window = _glfwLibrary.currentWindow; - if (window->GLX.has_GLX_EXT_swap_control) + if (window->GLX.EXT_swap_control) { window->GLX.SwapIntervalEXT(_glfwLibrary.X11.display, window->X11.handle, interval); } - else if (window->GLX.has_GLX_SGI_swap_control) + else if (window->GLX.SGI_swap_control) window->GLX.SwapIntervalSGI(interval); } diff --git a/src/x11_platform.h b/src/x11_platform.h index d952bf1a..98cbe007 100644 --- a/src/x11_platform.h +++ b/src/x11_platform.h @@ -101,14 +101,14 @@ typedef struct _GLFWcontextGLX PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC CreateContextWithConfigSGIX; PFNGLXGETVISUALFROMFBCONFIGSGIXPROC GetVisualFromFBConfigSGIX; PFNGLXCREATECONTEXTATTRIBSARBPROC CreateContextAttribsARB; - GLboolean has_GLX_SGIX_fbconfig; - GLboolean has_GLX_SGI_swap_control; - GLboolean has_GLX_EXT_swap_control; - GLboolean has_GLX_ARB_multisample; - GLboolean has_GLX_ARB_create_context; - GLboolean has_GLX_ARB_create_context_profile; - GLboolean has_GLX_ARB_create_context_robustness; - GLboolean has_GLX_EXT_create_context_es2_profile; + GLboolean SGIX_fbconfig; + GLboolean SGI_swap_control; + GLboolean EXT_swap_control; + GLboolean ARB_multisample; + GLboolean ARB_create_context; + GLboolean ARB_create_context_profile; + GLboolean ARB_create_context_robustness; + GLboolean EXT_create_context_es2_profile; } _GLFWcontextGLX; diff --git a/src/x11_window.c b/src/x11_window.c index e8cc25ca..f70f343b 100644 --- a/src/x11_window.c +++ b/src/x11_window.c @@ -249,7 +249,7 @@ static int getFBConfigAttrib(_GLFWwindow* window, GLXFBConfig fbconfig, int attr { int value; - if (window->GLX.has_GLX_SGIX_fbconfig) + if (window->GLX.SGIX_fbconfig) { window->GLX.GetFBConfigAttribSGIX(_glfwLibrary.X11.display, fbconfig, attrib, &value); @@ -275,7 +275,7 @@ static _GLFWfbconfig* getFBConfigs(_GLFWwindow* window, unsigned int* found) if (_glfwLibrary.X11.glxMajor == 1 && _glfwLibrary.X11.glxMinor < 3) { - if (!window->GLX.has_GLX_SGIX_fbconfig) + if (!window->GLX.SGIX_fbconfig) { _glfwSetError(GLFW_OPENGL_UNAVAILABLE, "X11/GLX: GLXFBConfig support not found"); @@ -283,7 +283,7 @@ static _GLFWfbconfig* getFBConfigs(_GLFWwindow* window, unsigned int* found) } } - if (window->GLX.has_GLX_SGIX_fbconfig) + if (window->GLX.SGIX_fbconfig) { fbconfigs = window->GLX.ChooseFBConfigSGIX(_glfwLibrary.X11.display, _glfwLibrary.X11.screen, @@ -356,7 +356,7 @@ static _GLFWfbconfig* getFBConfigs(_GLFWwindow* window, unsigned int* found) result[*found].auxBuffers = getFBConfigAttrib(window, fbconfigs[i], GLX_AUX_BUFFERS); result[*found].stereo = getFBConfigAttrib(window, fbconfigs[i], GLX_STEREO); - if (window->GLX.has_GLX_ARB_multisample) + if (window->GLX.ARB_multisample) result[*found].samples = getFBConfigAttrib(window, fbconfigs[i], GLX_SAMPLES); else result[*found].samples = 0; @@ -399,7 +399,7 @@ static int createContext(_GLFWwindow* window, setGLXattrib(attribs, index, GLX_FBCONFIG_ID, (int) fbconfigID); setGLXattrib(attribs, index, None, None); - if (window->GLX.has_GLX_SGIX_fbconfig) + if (window->GLX.SGIX_fbconfig) { fbconfig = window->GLX.ChooseFBConfigSGIX(_glfwLibrary.X11.display, _glfwLibrary.X11.screen, @@ -423,7 +423,7 @@ static int createContext(_GLFWwindow* window, } // Retrieve the corresponding visual - if (window->GLX.has_GLX_SGIX_fbconfig) + if (window->GLX.SGIX_fbconfig) { window->GLX.visual = window->GLX.GetVisualFromFBConfigSGIX(_glfwLibrary.X11.display, *fbconfig); @@ -443,7 +443,7 @@ static int createContext(_GLFWwindow* window, return GL_FALSE; } - if (window->GLX.has_GLX_ARB_create_context) + if (window->GLX.ARB_create_context) { index = 0; @@ -475,7 +475,7 @@ static int createContext(_GLFWwindow* window, { int flags = 0; - if (!window->GLX.has_GLX_ARB_create_context_profile) + if (!window->GLX.ARB_create_context_profile) { _glfwSetError(GLFW_VERSION_UNAVAILABLE, "X11/GLX: An OpenGL profile requested but " @@ -484,7 +484,7 @@ static int createContext(_GLFWwindow* window, } if (wndconfig->glProfile == GLFW_OPENGL_ES2_PROFILE && - !window->GLX.has_GLX_EXT_create_context_es2_profile) + !window->GLX.EXT_create_context_es2_profile) { _glfwSetError(GLFW_VERSION_UNAVAILABLE, "X11/GLX: OpenGL ES 2.x profile requested but " @@ -506,7 +506,7 @@ static int createContext(_GLFWwindow* window, { int strategy; - if (!window->GLX.has_GLX_ARB_create_context_robustness) + if (!window->GLX.ARB_create_context_robustness) { _glfwSetError(GLFW_VERSION_UNAVAILABLE, "X11/GLX: An OpenGL robustness strategy was " @@ -546,7 +546,7 @@ static int createContext(_GLFWwindow* window, } else { - if (window->GLX.has_GLX_SGIX_fbconfig) + if (window->GLX.SGIX_fbconfig) { window->GLX.context = window->GLX.CreateContextWithConfigSGIX(_glfwLibrary.X11.display, @@ -596,10 +596,10 @@ static void initGLXExtensions(_GLFWwindow* window) _glfwPlatformGetProcAddress("glXSwapIntervalEXT"); if (window->GLX.SwapIntervalEXT) - window->GLX.has_GLX_EXT_swap_control = GL_TRUE; + window->GLX.EXT_swap_control = GL_TRUE; } - if (!window->GLX.has_GLX_EXT_swap_control) + if (!window->GLX.EXT_swap_control) { if (_glfwPlatformExtensionSupported("GLX_SGI_swap_control")) { @@ -607,7 +607,7 @@ static void initGLXExtensions(_GLFWwindow* window) _glfwPlatformGetProcAddress("glXSwapIntervalSGI"); if (window->GLX.SwapIntervalSGI) - window->GLX.has_GLX_SGI_swap_control = GL_TRUE; + window->GLX.SGI_swap_control = GL_TRUE; } } @@ -627,12 +627,12 @@ static void initGLXExtensions(_GLFWwindow* window) window->GLX.CreateContextWithConfigSGIX && window->GLX.GetVisualFromFBConfigSGIX) { - window->GLX.has_GLX_SGIX_fbconfig = GL_TRUE; + window->GLX.SGIX_fbconfig = GL_TRUE; } } if (_glfwPlatformExtensionSupported("GLX_ARB_multisample")) - window->GLX.has_GLX_ARB_multisample = GL_TRUE; + window->GLX.ARB_multisample = GL_TRUE; if (_glfwPlatformExtensionSupported("GLX_ARB_create_context")) { @@ -640,26 +640,26 @@ static void initGLXExtensions(_GLFWwindow* window) _glfwPlatformGetProcAddress("glXCreateContextAttribsARB"); if (window->GLX.CreateContextAttribsARB) - window->GLX.has_GLX_ARB_create_context = GL_TRUE; + window->GLX.ARB_create_context = GL_TRUE; } - if (window->GLX.has_GLX_ARB_create_context) + if (window->GLX.ARB_create_context) { if (_glfwPlatformExtensionSupported("GLX_ARB_create_context_profile")) - window->GLX.has_GLX_ARB_create_context_profile = GL_TRUE; + window->GLX.ARB_create_context_profile = GL_TRUE; } - if (window->GLX.has_GLX_ARB_create_context && - window->GLX.has_GLX_ARB_create_context_profile) + if (window->GLX.ARB_create_context && + window->GLX.ARB_create_context_profile) { if (_glfwPlatformExtensionSupported("GLX_EXT_create_context_es2_profile")) - window->GLX.has_GLX_EXT_create_context_es2_profile = GL_TRUE; + window->GLX.EXT_create_context_es2_profile = GL_TRUE; } - if (window->GLX.has_GLX_ARB_create_context) + if (window->GLX.ARB_create_context) { if (_glfwPlatformExtensionSupported("GLX_ARB_create_context_robustness")) - window->GLX.has_GLX_ARB_create_context_robustness = GL_TRUE; + window->GLX.ARB_create_context_robustness = GL_TRUE; } } @@ -1673,7 +1673,7 @@ void _glfwPlatformRefreshWindowParams(void) int attribs[] = { GLX_FBCONFIG_ID, window->GLX.fbconfigID, None }; - if (window->GLX.has_GLX_SGIX_fbconfig) + if (window->GLX.SGIX_fbconfig) { fbconfig = window->GLX.ChooseFBConfigSGIX(_glfwLibrary.X11.display, _glfwLibrary.X11.screen, @@ -1718,7 +1718,7 @@ void _glfwPlatformRefreshWindowParams(void) window->stereo = getFBConfigAttrib(window, *fbconfig, GLX_STEREO) ? GL_TRUE : GL_FALSE; // Get FSAA buffer sample count - if (window->GLX.has_GLX_ARB_multisample) + if (window->GLX.ARB_multisample) window->samples = getFBConfigAttrib(window, *fbconfig, GLX_SAMPLES); else window->samples = 0;