Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid multiple PFNGLXCREATECONTEXTATTRIBSARBPROC typedefs

Browse Source 
Move the compatibility typedef of PFNGLXCREATECONTEXTATTRIBSARBPROC
back inside the conditional it is in for 3.0.x.

Closes https://github.com/wxWidgets/wxWidgets/pull/1467

Closes #18324.
This commit is contained in:
Olly Betts
2019-08-05 16:49:40 +12:00
committed by Vadim Zeitlin
parent 848f5e78a6
commit 76bc795737
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/unix/glx11.cpp
View File

@@ -69,11 +69,6 @@
#define GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20B2 #define GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB 0x20B2
#endif #endif
/* Typedef for the GL 3.0 context creation function */
typedef GLXContext(*PFNGLXCREATECONTEXTATTRIBSARBPROC)
(Display * dpy, GLXFBConfig config, GLXContext share_context,
Bool direct, const int *attrib_list);
#ifndef GLX_ARB_create_context #ifndef GLX_ARB_create_context
#define GLX_ARB_create_context #define GLX_ARB_create_context
#define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091 #define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091
@@ -81,6 +76,11 @@ typedef GLXContext(*PFNGLXCREATECONTEXTATTRIBSARBPROC)
#define GLX_CONTEXT_FLAGS_ARB 0x2094 #define GLX_CONTEXT_FLAGS_ARB 0x2094
#define GLX_CONTEXT_DEBUG_BIT_ARB 0x0001 #define GLX_CONTEXT_DEBUG_BIT_ARB 0x0001
#define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002 #define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002
/* Typedef for the GL 3.0 context creation function */
typedef GLXContext(*PFNGLXCREATECONTEXTATTRIBSARBPROC)
(Display * dpy, GLXFBConfig config, GLXContext share_context,
Bool direct, const int *attrib_list);
#endif #endif
#ifndef GLX_ARB_create_context_profile #ifndef GLX_ARB_create_context_profile