From: Andreas Hartmetz <ahartmetz@gmail.com>
Date: Fri, 12 Jul 2013 08:46:51 +0000 (+0200)
Subject: Update GLX attrib_list support from GLX 1.3 to 1.4.
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=e0d4ababfb09afe0f140754163d7a75186b3a037;hp=621d0b3f841872e7d73465a7ec55afebad17bfdb;p=apitrace

Update GLX attrib_list support from GLX 1.3 to 1.4.
---

diff --git a/specs/glxapi.py b/specs/glxapi.py
index e9fa7bd..28884a0 100644
--- a/specs/glxapi.py
+++ b/specs/glxapi.py
@@ -228,7 +228,9 @@ GLXVisualAttribs = AttribArray(GLXEnum, GLXCommonSizeAttribs + [
     ('GLX_RGBA', None),
     ('GLX_DOUBLEBUFFER', None),
     ('GLX_STEREO', None),
-    ('GLX_AUX_BUFFERS', UInt)],
+    ('GLX_AUX_BUFFERS', UInt),
+    ('GLX_SAMPLE_BUFFERS', UInt),
+    ('GLX_SAMPLES', UInt)],
     isConst = False
 )
 
@@ -238,6 +240,8 @@ GLXFBConfigCommonAttribs = GLXCommonSizeAttribs + [
     ('GLX_DOUBLEBUFFER', Bool),
     ('GLX_STEREO', Bool),
     ('GLX_AUX_BUFFERS', UInt),
+    ('GLX_SAMPLE_BUFFERS', UInt),
+    ('GLX_SAMPLES', UInt),
     ('GLX_RENDER_TYPE', Flags(Int, ["GLX_RGBA_BIT", "GLX_COLOR_INDEX_BIT"])),
     ('GLX_DRAWABLE_TYPE', Flags(Int, ["GLX_WINDOW_BIT", "GLX_PIXMAP_BIT", "GLX_PBUFFER_BIT"])),
     ('GLX_X_RENDERABLE', Bool),
@@ -253,15 +257,14 @@ GLXFBConfigCommonAttribs = GLXCommonSizeAttribs + [
 
 GLXFBConfigGLXAttribs = GLXFBConfigCommonAttribs + [
     ('GLX_FBCONFIG_ID', Int), # an XID, can we do better than int?
-]
-
-GLXFBConfigSGIXAttribs = GLXFBConfigCommonAttribs + [
-    ('GLX_SAMPLE_BUFFERS', UInt),
-    ('GLX_SAMPLES', UInt)
+    ('GLX_MAX_PBUFFER_WIDTH', Int),
+    ('GLX_MAX_PBUFFER_HEIGHT', Int),
+    ('GLX_MAX_PBUFFER_PIXELS', Int),
+    ('GLX_VISUAL_ID', Int)  # another XID
 ]
 
 GLXFBConfigAttribs = AttribArray(GLXEnum, GLXFBConfigGLXAttribs)
-GLXFBConfigSGIXAttribs = AttribArray(GLXEnum, GLXFBConfigSGIXAttribs, isConst = False)
+GLXFBConfigSGIXAttribs = AttribArray(GLXEnum, GLXFBConfigCommonAttribs, isConst = False)
 
 GLXContextAttribs = AttribArray(GLXEnum, [
     ('GLX_CONTEXT_MAJOR_VERSION_ARB', Int),