From: José Fonseca <jose.r.fonseca@gmail.com>
Date: Tue, 10 Jan 2012 20:20:37 +0000 (+0000)
Subject: Merge branch 'trace-threads'
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=a9d7f8edfea904f8dc84f2ad472cd542437935f7;hp=b89fa487b2d7eeaefabddb390f82467cee1bf0da;p=apitrace

Merge branch 'trace-threads'
---

diff --git a/common/trace_file_snappy.cpp b/common/trace_file_snappy.cpp
index e4c17cd..c0727cd 100644
--- a/common/trace_file_snappy.cpp
+++ b/common/trace_file_snappy.cpp
@@ -241,7 +241,7 @@ size_t SnappyFile::rawRead(void *buffer, size_t length)
 
 int SnappyFile::rawGetc()
 {
-    int c = 0;
+    unsigned char c = 0;
     if (rawRead(&c, 1) != 1)
         return -1;
     return c;
diff --git a/gltrace.py b/gltrace.py
index c75ac80..00dfc4e 100644
--- a/gltrace.py
+++ b/gltrace.py
@@ -586,6 +586,13 @@ class GlTracer(Tracer):
         'ELEMENT_ARRAY_BUFFER',
         'PIXEL_PACK_BUFFER',
         'PIXEL_UNPACK_BUFFER',
+        'UNIFORM_BUFFER',
+        'TEXTURE_BUFFER',
+        'TRANSFORM_FEEDBACK_BUFFER',
+        'COPY_READ_BUFFER',
+        'COPY_WRITE_BUFFER',
+        'DRAW_INDIRECT_BUFFER',
+        'ATOMIC_COUNTER_BUFFER',
     ]
 
     def wrap_ret(self, function, instance):
diff --git a/specs/glparams.py b/specs/glparams.py
index 2513175..3f1e022 100644
--- a/specs/glparams.py
+++ b/specs/glparams.py
@@ -1446,9 +1446,9 @@ parameters = [
     ("",	X,	1,	"GL_MAP2_VERTEX_ATTRIB13_4_NV"),	# 0x867D
     ("",	X,	1,	"GL_MAP2_VERTEX_ATTRIB14_4_NV"),	# 0x867E
     ("",	X,	1,	"GL_MAP2_VERTEX_ATTRIB15_4_NV"),	# 0x867F
-    ("",	X,	1,	"GL_TEXTURE_COMPRESSED_IMAGE_SIZE"),	# 0x86A0
+    ("glGetTexLevelParameter",	I,	1,	"GL_TEXTURE_COMPRESSED_IMAGE_SIZE"),	# 0x86A0
     ("glGetTexLevelParameter",	B,	1,	"GL_TEXTURE_COMPRESSED"),	# 0x86A1
-    ("",	X,	1,	"GL_NUM_COMPRESSED_TEXTURE_FORMATS"),	# 0x86A2
+    ("glGet",	I,	1,	"GL_NUM_COMPRESSED_TEXTURE_FORMATS"),	# 0x86A2
     #XXX: the list is GL_NUM_COMPRESSED_TEXTURES
     #("glGet",	E,	1,	"GL_COMPRESSED_TEXTURE_FORMATS"),	# 0x86A3
     ("glGet",	I,	1,	"GL_MAX_VERTEX_UNITS_ARB"),	# 0x86A4
diff --git a/specs/glxapi.py b/specs/glxapi.py
index 374475c..f13d592 100644
--- a/specs/glxapi.py
+++ b/specs/glxapi.py
@@ -383,6 +383,10 @@ glxapi.add_functions([
     # GLX_MESA_set_3dfx_mode
     Function(Bool, "glXSet3DfxModeMESA", [(Int, "mode")]),
 
+    # GLX_MESA_swap_control
+    Function(Int, "glXSwapIntervalMESA", [(UInt, "interval")]),
+    Function(Int, "glXGetSwapIntervalMESA", []),
+
     # GLX_OML_sync_control
     Function(Bool, "glXGetSyncValuesOML", [(Display, "dpy"), (GLXDrawable, "drawable"), (OpaquePointer(Int64), "ust"), (OpaquePointer(Int64), "msc"), (OpaquePointer(Int64), "sbc")]),
     Function(Bool, "glXGetMscRateOML", [(Display, "dpy"), (GLXDrawable, "drawable"), (OpaquePointer(Int32), "numerator"), (OpaquePointer(Int32), "denominator")]),