gltrace,glretrace: A few more tweaks to (no) side-effects flags.

diff --git a/common/trace_parser_flags.cpp b/common/trace_parser_flags.cpp
index f574be96081601209d11b24f4ab4ce0b0d23257e..a799bd8787971e2a6a570667c963138189749a4c 100644 (file)
--- a/common/trace_parser_flags.cpp
+++ b/common/trace_parser_flags.cpp
@@ -212,9 +212,6 @@ callFlagTable[] = {
     { "glGetCombinerOutputParameterfvNV",              CALL_FLAG_NO_SIDE_EFFECTS },
     { "glGetCombinerOutputParameterivNV",              CALL_FLAG_NO_SIDE_EFFECTS },
     { "glGetCombinerStageParameterfvNV",               CALL_FLAG_NO_SIDE_EFFECTS },
-    { "glGetCompressedMultiTexImageEXT",               CALL_FLAG_NO_SIDE_EFFECTS },
-    { "glGetCompressedTexImageARB",                    CALL_FLAG_NO_SIDE_EFFECTS },
-    { "glGetCompressedTextureImageEXT",                CALL_FLAG_NO_SIDE_EFFECTS },
     { "glGetConvolutionFilterEXT",                     CALL_FLAG_NO_SIDE_EFFECTS },
     { "glGetConvolutionParameterfv",                   CALL_FLAG_NO_SIDE_EFFECTS },
     { "glGetConvolutionParameterfvEXT",                CALL_FLAG_NO_SIDE_EFFECTS },
@@ -291,7 +288,6 @@ callFlagTable[] = {
     { "glGetMultiTexGendvEXT",                         CALL_FLAG_NO_SIDE_EFFECTS },
     { "glGetMultiTexGenfvEXT",                         CALL_FLAG_NO_SIDE_EFFECTS },
     { "glGetMultiTexGenivEXT",                         CALL_FLAG_NO_SIDE_EFFECTS },
-    { "glGetMultiTexImageEXT",                         CALL_FLAG_NO_SIDE_EFFECTS },
     { "glGetMultiTexLevelParameterfvEXT",              CALL_FLAG_NO_SIDE_EFFECTS },
     { "glGetMultiTexLevelParameterivEXT",              CALL_FLAG_NO_SIDE_EFFECTS },
     { "glGetMultiTexParameterIivEXT",                  CALL_FLAG_NO_SIDE_EFFECTS },

diff --git a/retrace/glretrace.py b/retrace/glretrace.py
index 92dcb0e322f17bea12d468ba63fb0e88bf402eda..8b6c0d5c99292fda5a6a05871cbab25075fae25f 100644 (file)
--- a/retrace/glretrace.py
+++ b/retrace/glretrace.py
@@ -130,6 +130,7 @@ class GlRetracer(Retracer):
     # object.  See also the ARB_pixel_buffer_object specification.
     pack_function_names = set([
         'glGetCompressedTexImage',
+        'glGetCompressedTexImageARB',
         'glGetCompressedTextureImageEXT',
         'glGetCompressedMultiTexImageEXT',
         'glGetConvolutionFilter',

diff --git a/specs/glapi.py b/specs/glapi.py
index 619410327c03f5cbda972b47df44968794af5ea0..1c1fef5c45ece849216ca3ddb74bb75bcabf46a5 100644 (file)
--- a/specs/glapi.py
+++ b/specs/glapi.py
@@ -790,7 +790,7 @@ glapi.addFunctions([
     GlFunction(Void, "glCompressedTexSubImage3DARB", [(GLenum, "target"), (GLint, "level"), (GLint, "xoffset"), (GLint, "yoffset"), (GLint, "zoffset"), (GLsizei, "width"), (GLsizei, "height"), (GLsizei, "depth"), (GLenum, "format"), (GLsizei, "imageSize"), (Blob(Const(GLvoid), "imageSize"), "data")]),
     GlFunction(Void, "glCompressedTexSubImage2DARB", [(GLenum, "target"), (GLint, "level"), (GLint, "xoffset"), (GLint, "yoffset"), (GLsizei, "width"), (GLsizei, "height"), (GLenum, "format"), (GLsizei, "imageSize"), (Blob(Const(GLvoid), "imageSize"), "data")]),
     GlFunction(Void, "glCompressedTexSubImage1DARB", [(GLenum, "target"), (GLint, "level"), (GLint, "xoffset"), (GLsizei, "width"), (GLenum, "format"), (GLsizei, "imageSize"), (Blob(Const(GLvoid), "imageSize"), "data")]),
-    GlFunction(Void, "glGetCompressedTexImageARB", [(GLenum, "target"), (GLint, "level"), Out(GLpointer, "img")], sideeffects=False),
+    GlFunction(Void, "glGetCompressedTexImageARB", [(GLenum, "target"), (GLint, "level"), Out(GLpointer, "img")]),
 
     # GL_ARB_point_parameters
     GlFunction(Void, "glPointParameterfARB", [(GLenum, "pname"), (GLfloat, "param")]),
@@ -1311,7 +1311,7 @@ glapi.addFunctions([
     GlFunction(Void, "glGetnMinmaxARB", [(GLenum, "target"), (GLboolean, "reset"), (GLenum, "format"), (GLenum, "type"), (GLsizei, "bufSize"), Out(OpaqueBlob(GLvoid, "bufSize"), "values")]),
     GlFunction(Void, "glGetnTexImageARB", [(GLenum, "target"), (GLint, "level"), (GLenum, "format"), (GLenum, "type"), (GLsizei, "bufSize"), Out(OpaqueBlob(GLvoid, "bufSize"), "img")]),
     GlFunction(Void, "glReadnPixelsARB", [(GLint, "x"), (GLint, "y"), (GLsizei, "width"), (GLsizei, "height"), (GLenum, "format"), (GLenum, "type"), (GLsizei, "bufSize"), Out(OpaqueBlob(GLvoid, "bufSize"), "data")]),
-    GlFunction(Void, "glGetnCompressedTexImageARB", [(GLenum, "target"), (GLint, "lod"), (GLsizei, "bufSize"), Out(OpaqueBlob(GLvoid, "bufSize"), "img")], sideeffects=False),
+    GlFunction(Void, "glGetnCompressedTexImageARB", [(GLenum, "target"), (GLint, "lod"), (GLsizei, "bufSize"), Out(OpaqueBlob(GLvoid, "bufSize"), "img")]),
     GlFunction(Void, "glGetnUniformfvARB", [(GLprogram, "program"), (GLlocation, "location"), (GLsizei, "bufSize"), Out(Array(GLfloat, "bufSize"), "params")], sideeffects=False),
     GlFunction(Void, "glGetnUniformivARB", [(GLprogram, "program"), (GLlocation, "location"), (GLsizei, "bufSize"), Out(Array(GLint, "bufSize"), "params")], sideeffects=False),
     GlFunction(Void, "glGetnUniformuivARB", [(GLprogram, "program"), (GLlocation, "location"), (GLsizei, "bufSize"), Out(Array(GLuint, "bufSize"), "params")], sideeffects=False),