浏览代码

respect old versions of glx.h a little better

David Rose 21 年之前
父节点
当前提交
9766fe68c3
共有 2 个文件被更改,包括 1 次插入1 次删除
  1. 0 1
      panda/src/glxdisplay/glxGraphicsPipe.h
  2. 1 0
      panda/src/glxdisplay/glxext.h

+ 0 - 1
panda/src/glxdisplay/glxGraphicsPipe.h

@@ -55,7 +55,6 @@ typedef int XIC;
 #if !defined(HAVE_GLXFBCONFIG) && defined(GLX_SGIX_fbconfig) && defined(GLX_SGIX_pbuffer)
 #if !defined(HAVE_GLXFBCONFIG) && defined(GLX_SGIX_fbconfig) && defined(GLX_SGIX_pbuffer)
   // If the system glx version isn't 1.3, but these were defined as
   // If the system glx version isn't 1.3, but these were defined as
   // extensions, we can work with that.
   // extensions, we can work with that.
-  #define GLX_RGBA_TYPE GLX_RGBA_TYPE_SGIX
   #define GLXFBConfig GLXFBConfigSGIX
   #define GLXFBConfig GLXFBConfigSGIX
   #define GLXPbuffer GLXPbufferSGIX
   #define GLXPbuffer GLXPbufferSGIX
   #define glXChooseFBConfig glXChooseFBConfigSGIX
   #define glXChooseFBConfig glXChooseFBConfigSGIX

+ 1 - 0
panda/src/glxdisplay/glxext.h

@@ -332,6 +332,7 @@ typedef struct {
      the following to compile. */
      the following to compile. */
 typedef struct __GLXFBConfigRec *GLXFBConfig;    
 typedef struct __GLXFBConfigRec *GLXFBConfig;    
 typedef XID GLXPbuffer;
 typedef XID GLXPbuffer;
+typedef XID GLXWindow;
 
 
 #ifdef GLX_GLXEXT_PROTOTYPES
 #ifdef GLX_GLXEXT_PROTOTYPES
 extern GLXFBConfig * glXGetFBConfigs (Display *, int, int *);
 extern GLXFBConfig * glXGetFBConfigs (Display *, int, int *);