OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0025442: Visualization, TKOpenGl - prevent inclusion of system header glxext.h

Browse Source 
Define GLX_GLXEXT_LEGACY in addition to GL_GLEXT_LEGACY to prevent implicit
inclusion of header GL/glxext.h by system header GL/glx.h

Update glext.t to current state.
This commit is contained in:
kgv 2014-10-31 20:42:31 -04:00 committed by bugmaster
parent f3fb84ce21
commit 00ea319b16
3 changed files with 844 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/OpenGl/OpenGl_Context.cxx
View File

@ -48,18 +48,6 @@
#include <GL/glx.h> // glXGetProcAddress() #include <GL/glx.h> // glXGetProcAddress()
#endif #endif
// GL_NVX_gpu_memory_info
#ifndef GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX
enum
{
GL_GPU_MEMORY_INFO_DEDICATED_VIDMEM_NVX = 0x9047,
GL_GPU_MEMORY_INFO_TOTAL_AVAILABLE_MEMORY_NVX = 0x9048,
GL_GPU_MEMORY_INFO_CURRENT_AVAILABLE_VIDMEM_NVX = 0x9049,
GL_GPU_MEMORY_INFO_EVICTION_COUNT_NVX = 0x904A,
GL_GPU_MEMORY_INFO_EVICTED_MEMORY_NVX = 0x904B
};
#endif
IMPLEMENT_STANDARD_HANDLE (OpenGl_Context, Standard_Transient) IMPLEMENT_STANDARD_HANDLE (OpenGl_Context, Standard_Transient)
IMPLEMENT_STANDARD_RTTIEXT(OpenGl_Context, Standard_Transient) IMPLEMENT_STANDARD_RTTIEXT(OpenGl_Context, Standard_Transient)

2
src/OpenGl/OpenGl_GlFunctions.hxx
View File

@ -34,6 +34,7 @@
// exclude modern definitions and system-provided glext.h, should be defined before gl.h inclusion // exclude modern definitions and system-provided glext.h, should be defined before gl.h inclusion
#define GL_GLEXT_LEGACY #define GL_GLEXT_LEGACY
#define GLX_GLXEXT_LEGACY
// include main OpenGL header provided with system // include main OpenGL header provided with system
#if defined(__APPLE__) #if defined(__APPLE__)
@ -153,6 +154,7 @@
#undef GL_VERSION_4_2 #undef GL_VERSION_4_2
#undef GL_VERSION_4_3 #undef GL_VERSION_4_3
#undef GL_VERSION_4_4 #undef GL_VERSION_4_4
#undef GL_VERSION_4_5
// include glext.h provided by Khronos group // include glext.h provided by Khronos group
#include <glext.h> #include <glext.h>

973
src/OpenGl/glext.h Executable file → Normal file
View File

File diff suppressed because it is too large Load Diff