gltrace: Simplify AttribArray further.

[apitrace] / specs / cglapi.py

diff --git a/specs/cglapi.py b/specs/cglapi.py
index 0169452f0890a776db044b11e30f8cd83a512944..f54ce8a29c7910660de87f49053f05b8ceb436bd 100644 (file)
--- a/specs/cglapi.py
+++ b/specs/cglapi.py
@@ -44,49 +44,57 @@ CGSConnectionID = Opaque("CGSConnectionID")
 CGSWindowID = Alias("CGSWindowID", Int)
 CGSSurfaceID = Alias("CGSSurfaceID", Int)
 
-CGLPixelFormatAttribute = Enum("CGLPixelFormatAttribute", [
+CGLPixelFormatBoolAttributes = [
     "kCGLPFAAllRenderers",
     "kCGLPFADoubleBuffer",
     "kCGLPFAStereo",
     "kCGLPFAAuxBuffers",
-    "kCGLPFAColorSize",
-    "kCGLPFAAlphaSize",
-    "kCGLPFADepthSize",
-    "kCGLPFAStencilSize",
-    "kCGLPFAAccumSize",
     "kCGLPFAMinimumPolicy",
     "kCGLPFAMaximumPolicy",
     "kCGLPFAOffScreen",
     "kCGLPFAFullScreen",
-    "kCGLPFASampleBuffers",
-    "kCGLPFASamples",
     "kCGLPFAAuxDepthStencil",
     "kCGLPFAColorFloat",
     "kCGLPFAMultisample",
     "kCGLPFASupersample",
     "kCGLPFASampleAlpha",
-    "kCGLPFARendererID",
     "kCGLPFASingleRenderer",
     "kCGLPFANoRecovery",
     "kCGLPFAAccelerated",
     "kCGLPFAClosestPolicy",
+    "kCGLPFARobust",
     "kCGLPFABackingStore",
+    "kCGLPFAMPSafe",
     "kCGLPFAWindow",
+    "kCGLPFAMultiScreen",
     "kCGLPFACompliant",
-    "kCGLPFADisplayMask",
     "kCGLPFAPBuffer",
     "kCGLPFARemotePBuffer",
     "kCGLPFAAllowOfflineRenderers",
     "kCGLPFAAcceleratedCompute",
+    "kCGLOGLPVersion_Legacy",
+    "kCGLOGLPVersion_3_2_Core"
+]
+
+CGLPixelFormatIntAttributes = [
+    "kCGLPFAColorSize",
+    "kCGLPFAAlphaSize",
+    "kCGLPFADepthSize",
+    "kCGLPFAStencilSize",
+    "kCGLPFAAccumSize",
+    "kCGLPFASampleBuffers",
+    "kCGLPFASamples",
+    "kCGLPFARendererID",
+    "kCGLPFADisplayMask",
     "kCGLPFAOpenGLProfile",
-    "kCGLPFAVirtualScreenCount",
-    "kCGLPFARobust",
-    "kCGLPFAMPSafe",
-    "kCGLPFAMultiScreen",
+    "kCGLPFAVirtualScreenCount"
+]
 
-    "kCGLOGLPVersion_Legacy",
-    "kCGLOGLPVersion_3_2_Core",
-])
+CGLPixelFormatAttribute = Enum("CGLPixelFormatAttribute", CGLPixelFormatBoolAttributes + CGLPixelFormatIntAttributes)
+
+CGLPixelFormatAttribs = AttribArray(Const(CGLPixelFormatAttribute),
+                                    [(a, None) for a in CGLPixelFormatBoolAttributes] +
+                                    [(a, Int) for a in CGLPixelFormatIntAttributes])
 
 CGLRendererProperty = Enum("CGLRendererProperty", [
     "kCGLRPOffScreen",
@@ -188,7 +196,7 @@ cglapi.addFunctions([
     Function(CGLContextObj, "CGLGetCurrentContext", []),
 
     # OpenGL.h, OpenGL framework
-    Function(CGLError, "CGLChoosePixelFormat", [(Array(Const(CGLPixelFormatAttribute), "_AttribList_size(attribs)"), "attribs"), Out(Pointer(CGLPixelFormatObj), "pix"), Out(Pointer(GLint), "npix")]),
+    Function(CGLError, "CGLChoosePixelFormat", [(CGLPixelFormatAttribs, "attribs"), Out(Pointer(CGLPixelFormatObj), "pix"), Out(Pointer(GLint), "npix")]),
     Function(CGLError, "CGLDestroyPixelFormat", [(CGLPixelFormatObj, "pix")]),
     Function(CGLError, "CGLDescribePixelFormat", [(CGLPixelFormatObj, "pix"), (GLint, "pix_num"), (CGLPixelFormatAttribute, "attrib"), Out(Pointer(GLint), "value")]),
     Function(Void, "CGLReleasePixelFormat", [(CGLPixelFormatObj, "pix")]),
@@ -247,7 +255,7 @@ cglapi.addFunctions([
     Function(CGLError, "CGLUpdateContext", [(CGLContextObj, "ctx")]),
     # XXX: All the following prototypes are little more than guesses
     # TODO: A potentially simpler alternative would be to use the
-    # DYLD_INSERT_LIBRARIES mechanism and only intercept the calls that we
+    # DYLD_INTERPOSE mechanism and only intercept the calls that we
     # really care about
     Function(CGLError, "CGLOpenCLMuxLockDown", [], internal=True),
     Function(GLboolean, "CGLAreContextsShared", [(CGLContextObj, "ctx1"), (CGLContextObj, "ctx2")], internal=True),