GLX: More consistent naming of an AttribArray.

[apitrace] / specs / glxapi.py

diff --git a/specs/glxapi.py b/specs/glxapi.py
index e9fa7bde31c271cd14ac2022ba52536191751538..07ff361cd3c41fada80a7222660550ad791a435b 100644 (file)
--- 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,17 +257,16 @@ 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, [
+GLXContextARBAttribs = AttribArray(GLXEnum, [
     ('GLX_CONTEXT_MAJOR_VERSION_ARB', Int),
     ('GLX_CONTEXT_MINOR_VERSION_ARB', Int),
     ('GLX_CONTEXT_FLAGS_ARB', Flags(Int, ["GLX_CONTEXT_DEBUG_BIT_ARB", "GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB"])),
@@ -353,7 +356,7 @@ glxapi.addFunctions([
     # GLX_ARB_create_context
     Function(GLXContext, "glXCreateContextAttribsARB", [(Display, "dpy"), (GLXFBConfig, "config"),
                                                         (GLXContext, "share_context"), (Bool, "direct"),
-                                                        (GLXContextAttribs,  "attrib_list")]),
+                                                        (GLXContextARBAttribs,  "attrib_list")]),
 
     # GLX_SGI_swap_control
     Function(Int, "glXSwapIntervalSGI", [(Int, "interval")]),