X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=gltypes.py;h=32a6ca890612431543032d140ff4d3169a6298b8;hb=2cbbd6279afb97be5b8e76135d2bb8b98b199b84;hp=3fc2fe707a41a427345c8080e8c17971b901ad72;hpb=56139d1909724fe48f68b6b7c5e516b53681d7cf;p=apitrace

diff --git a/gltypes.py b/gltypes.py
index 3fc2fe7..32a6ca8 100644
--- a/gltypes.py
+++ b/gltypes.py
@@ -56,12 +56,13 @@ GLcharARB = Alias("GLcharARB", SChar)
 GLstringARB = String("GLcharARB *")
 GLintptrARB = Alias("GLintptrARB", Int)
 GLsizeiptrARB = Alias("GLsizeiptrARB", Int)
-GLhandleARB = Alias("GLhandleARB", UInt)
+GLhandleARB = Handle("handleARB", Alias("GLhandleARB", UInt))
 GLhalfARB = Alias("GLhalfARB", UShort)
 GLhalfNV = Alias("GLhalfNV", UShort)
 GLint64EXT = Alias("GLint64EXT", Int64)
 GLuint64EXT = Alias("GLuint64EXT", UInt64)
 GLDEBUGPROCARB = Opaque("GLDEBUGPROCARB")
+GLDEBUGPROCAMD = Opaque("GLDEBUGPROCAMD")
 
 GLlist = Handle("list", GLuint)
 GLtexture = Handle("texture", GLuint)
@@ -71,16 +72,16 @@ GLfenceNV = Handle("fenceNV", GLuint)
 GLprogram = Handle("program", GLuint)
 GLshader = Handle("shader", GLuint)
 GLlocation = Handle("location", GLint, key=('program', GLuint))
-GLlocationARB = Handle("locationARB", GLint)
+GLlocationARB = Handle("locationARB", GLint, key=('programObj', GLhandleARB))
 GLprogramARB = Handle("programARB", GLuint)
-GLprogramEXT = Handle("programEXT", GLuint)
-GLprogramNV = Handle("programNV", GLuint)
 GLframebuffer = Handle("framebuffer", GLuint)
 GLrenderbuffer = Handle("renderbuffer", GLuint)
 GLfragmentShaderATI = Handle("fragmentShaderATI", GLuint)
 GLarray = Handle("array", GLuint)
 GLregion = Handle("region", GLuint)
 GLmap = Handle("map", OpaquePointer(GLvoid))
+GLpipeline = Handle("pipeline", GLuint)
+GLsampler = Handle("sampler", GLuint)
 
 GLsync_ = Opaque("GLsync")
 GLsync = Handle("sync", GLsync_)
@@ -160,3 +161,24 @@ GLbitfield_client_attrib = Flags(GLbitfield, [
     "GL_CLIENT_VERTEX_ARRAY_BIT", # 0x00000002
 ])
 
+GLbitfield_shader = Flags(GLbitfield, [
+    "GL_ALL_SHADER_BITS",                        # 0xFFFFFFFF
+    "GL_VERTEX_SHADER_BIT",                      # 0x00000001
+    "GL_FRAGMENT_SHADER_BIT",                    # 0x00000002
+    "GL_GEOMETRY_SHADER_BIT",                    # 0x00000004
+    "GL_TESS_CONTROL_SHADER_BIT",                # 0x00000008
+    "GL_TESS_EVALUATION_SHADER_BIT",             # 0x00000010
+])
+
+GLbitfield_access = Flags(GLbitfield, [
+    "GL_MAP_READ_BIT",                # 0x0001
+    "GL_MAP_WRITE_BIT",               # 0x0002
+    "GL_MAP_INVALIDATE_RANGE_BIT",    # 0x0004
+    "GL_MAP_INVALIDATE_BUFFER_BIT",   # 0x0008
+    "GL_MAP_FLUSH_EXPLICIT_BIT",      # 0x0010
+    "GL_MAP_UNSYNCHRONIZED_BIT",      # 0x0020
+])
+
+GLbitfield_sync_flush = Flags(GLbitfield, [
+    "GL_SYNC_FLUSH_COMMANDS_BIT",				# 0x00000001
+])