Commits

Bart van Strien committed 9756e8d

Patch GLee for missing GLXContextID typedef after upstream (mesa) removal from header

Comments (0)

Files changed (2)

src/modules/graphics/opengl/GLee.c

 #endif
 #ifndef GLEE_C_DEFINED_glXGetContextIDEXT
 #define GLEE_C_DEFINED_glXGetContextIDEXT
-  GLXContextID __stdcall GLee_Lazy_glXGetContextIDEXT(const GLXContext  context)  {if (GLeeInit()) return glXGetContextIDEXT(context); return (GLXContextID)0;}
+  GLEE_GLXContextID __stdcall GLee_Lazy_glXGetContextIDEXT(const GLXContext  context)  {if (GLeeInit()) return glXGetContextIDEXT(context); return (GLEE_GLXContextID)0;}
   GLEEPFNGLXGETCONTEXTIDEXTPROC GLeeFuncPtr_glXGetContextIDEXT=GLee_Lazy_glXGetContextIDEXT;
 #endif
 #ifndef GLEE_C_DEFINED_glXImportContextEXT
 #define GLEE_C_DEFINED_glXImportContextEXT
-  GLXContext __stdcall GLee_Lazy_glXImportContextEXT(Display * dpy, GLXContextID  contextID)  {if (GLeeInit()) return glXImportContextEXT(dpy, contextID); return (GLXContext)0;}
+  GLXContext __stdcall GLee_Lazy_glXImportContextEXT(Display * dpy, GLEE_GLXContextID  contextID)  {if (GLeeInit()) return glXImportContextEXT(dpy, contextID); return (GLXContext)0;}
   GLEEPFNGLXIMPORTCONTEXTEXTPROC GLeeFuncPtr_glXImportContextEXT=GLee_Lazy_glXImportContextEXT;
 #endif
 #ifndef GLEE_C_DEFINED_glXFreeContextEXT

src/modules/graphics/opengl/GLee.h

 	#define GLX_GLXEXT_PROTOTYPES
 	#include <GL/gl.h>
 	#include <GL/glx.h>
+
+	typedef XID GLEE_GLXContextID;
 #endif
 
 #ifndef APIENTRY
 #endif
 #ifndef GLEE_H_DEFINED_glXGetContextIDEXT
 #define GLEE_H_DEFINED_glXGetContextIDEXT
-  typedef GLXContextID (APIENTRYP GLEEPFNGLXGETCONTEXTIDEXTPROC) (const GLXContext  context);
+  typedef GLEE_GLXContextID (APIENTRYP GLEEPFNGLXGETCONTEXTIDEXTPROC) (const GLXContext  context);
   GLEE_EXTERN GLEEPFNGLXGETCONTEXTIDEXTPROC GLeeFuncPtr_glXGetContextIDEXT;
   #define glXGetContextIDEXT GLeeFuncPtr_glXGetContextIDEXT
 #endif
 #ifndef GLEE_H_DEFINED_glXImportContextEXT
 #define GLEE_H_DEFINED_glXImportContextEXT
-  typedef GLXContext (APIENTRYP GLEEPFNGLXIMPORTCONTEXTEXTPROC) (Display * dpy, GLXContextID  contextID);
+  typedef GLXContext (APIENTRYP GLEEPFNGLXIMPORTCONTEXTEXTPROC) (Display * dpy, GLEE_GLXContextID  contextID);
   GLEE_EXTERN GLEEPFNGLXIMPORTCONTEXTEXTPROC GLeeFuncPtr_glXImportContextEXT;
   #define glXImportContextEXT GLeeFuncPtr_glXImportContextEXT
 #endif