LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-19 12:14:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bart van Strien
2013-12-27 16:50:07 +01:00
parent 85264f4bea
commit 90d041ed1b
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/GLee.c
+2 -2
View File
@@ -15423,12 +15423,12 @@ int __GLeeGLXNumExtensions=53;
#endif #endif
#ifndef GLEE_C_DEFINED_glXGetContextIDEXT #ifndef GLEE_C_DEFINED_glXGetContextIDEXT
#define 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; GLEEPFNGLXGETCONTEXTIDEXTPROC GLeeFuncPtr_glXGetContextIDEXT=GLee_Lazy_glXGetContextIDEXT;
#endif #endif
#ifndef GLEE_C_DEFINED_glXImportContextEXT #ifndef GLEE_C_DEFINED_glXImportContextEXT
#define 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; GLEEPFNGLXIMPORTCONTEXTEXTPROC GLeeFuncPtr_glXImportContextEXT=GLee_Lazy_glXImportContextEXT;
#endif #endif
#ifndef GLEE_C_DEFINED_glXFreeContextEXT #ifndef GLEE_C_DEFINED_glXFreeContextEXT
src/modules/graphics/opengl/GLee.h
+4 -2
View File
@@ -65,6 +65,8 @@
#define GLX_GLXEXT_PROTOTYPES #define GLX_GLXEXT_PROTOTYPES
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glx.h> #include <GL/glx.h>
typedef XID GLEE_GLXContextID;
#endif #endif
#ifndef APIENTRY #ifndef APIENTRY
@@ -23683,13 +23685,13 @@ GLEE_EXTERN GLboolean _GLEE_GLX_NV_video_output;
#endif #endif
#ifndef GLEE_H_DEFINED_glXGetContextIDEXT #ifndef GLEE_H_DEFINED_glXGetContextIDEXT
#define 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; GLEE_EXTERN GLEEPFNGLXGETCONTEXTIDEXTPROC GLeeFuncPtr_glXGetContextIDEXT;
#define glXGetContextIDEXT GLeeFuncPtr_glXGetContextIDEXT #define glXGetContextIDEXT GLeeFuncPtr_glXGetContextIDEXT
#endif #endif
#ifndef GLEE_H_DEFINED_glXImportContextEXT #ifndef GLEE_H_DEFINED_glXImportContextEXT
#define 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; GLEE_EXTERN GLEEPFNGLXIMPORTCONTEXTEXTPROC GLeeFuncPtr_glXImportContextEXT;
#define glXImportContextEXT GLeeFuncPtr_glXImportContextEXT #define glXImportContextEXT GLeeFuncPtr_glXImportContextEXT
#endif #endif