glretrace: Try to swizzle GL_ARB_copy_image name parameters.

diff --git a/specs/glapi.py b/specs/glapi.py
index 9b4789f37b9c2ebad69906ea73c6136135252bc6..2c234763851b95e62f9c199c8d28e8329e93e896 100644 (file)
--- a/specs/glapi.py
+++ b/specs/glapi.py
@@ -1383,7 +1383,7 @@ glapi.addFunctions([
     GlFunction(Void, "glDispatchComputeIndirect", [(GLintptr, "indirect")]),
 
     # GL_ARB_copy_image
-    GlFunction(Void, "glCopyImageSubData", [(GLuint, "srcName"), (GLenum, "srcTarget"), (GLint, "srcLevel"), (GLint, "srcX"), (GLint, "srcY"), (GLint, "srcZ"), (GLuint, "dstName"), (GLenum, "dstTarget"), (GLint, "dstLevel"), (GLint, "dstX"), (GLint, "dstY"), (GLint, "dstZ"), (GLsizei, "srcWidth"), (GLsizei, "srcHeight"), (GLsizei, "srcDepth")]),
+    GlFunction(Void, "glCopyImageSubData", [(GLname("srcTarget"), "srcName"), (GLenum, "srcTarget"), (GLint, "srcLevel"), (GLint, "srcX"), (GLint, "srcY"), (GLint, "srcZ"), (GLname("dstTarget"), "dstName"), (GLenum, "dstTarget"), (GLint, "dstLevel"), (GLint, "dstX"), (GLint, "dstY"), (GLint, "dstZ"), (GLsizei, "srcWidth"), (GLsizei, "srcHeight"), (GLsizei, "srcDepth")]),
 
     # GL_ARB_texture_view
     GlFunction(Void, "glTextureView", [(GLtexture, "texture"), (GLenum, "target"), (GLtexture, "origtexture"), (GLenum, "internalformat"), (GLuint, "minlevel"), (GLuint, "numlevels"), (GLuint, "minlayer"), (GLuint, "numlayers")]),
@@ -2805,7 +2805,7 @@ glapi.addFunctions([
     GlFunction(Void, "glVideoCaptureStreamParameterdvNV", [(GLuint, "video_capture_slot"), (GLuint, "stream"), (GLenum, "pname"), (Array(Const(GLdouble), "_gl_param_size(pname)"), "params")]),
 
     # GL_NV_copy_image
-    GlFunction(Void, "glCopyImageSubDataNV", [(GLuint, "srcName"), (GLenum, "srcTarget"), (GLint, "srcLevel"), (GLint, "srcX"), (GLint, "srcY"), (GLint, "srcZ"), (GLuint, "dstName"), (GLenum, "dstTarget"), (GLint, "dstLevel"), (GLint, "dstX"), (GLint, "dstY"), (GLint, "dstZ"), (GLsizei, "width"), (GLsizei, "height"), (GLsizei, "depth")]),
+    GlFunction(Void, "glCopyImageSubDataNV", [(GLname("srcTarget"), "srcName"), (GLenum, "srcTarget"), (GLint, "srcLevel"), (GLint, "srcX"), (GLint, "srcY"), (GLint, "srcZ"), (GLname("dstTarget"), "dstName"), (GLenum, "dstTarget"), (GLint, "dstLevel"), (GLint, "dstX"), (GLint, "dstY"), (GLint, "dstZ"), (GLsizei, "width"), (GLsizei, "height"), (GLsizei, "depth")]),
 
     # GL_EXT_separate_shader_objects
     GlFunction(Void, "glUseShaderProgramEXT", [(GLenum, "type"), (GLprogram, "program")]),

diff --git a/specs/gltypes.py b/specs/gltypes.py
index 0c1b7aee9e9c5bc32d67ae2175246e2f8c626ca7..5f325103cd49b6debe31db84e9db9e9edadadc6e 100644 (file)
--- a/specs/gltypes.py
+++ b/specs/gltypes.py
@@ -251,6 +251,40 @@ def GLindexBuffer(countExpr, typeExpr):
         contextLess=False,
     )
 
+# Polymorphic object name
+def GLname(targetExpr):
+    return Polymorphic(targetExpr, [
+        ('GL_BUFFER', GLbuffer),
+        ('GL_SHADER', GLshader),
+        ('GL_PROGRAM', GLprogram),
+        ('GL_VERTEX_ARRAY', GLarray),
+        ('GL_QUERY', GLquery),
+        ('GL_PROGRAM_PIPELINE', GLpipeline),
+        ('GL_TRANSFORM_FEEDBACK', GLuint),
+        ('GL_SAMPLER', GLsampler),
+        ('GL_TEXTURE', GLtexture),
+        ('GL_TEXTURE_1D', GLtexture),
+        ('GL_TEXTURE_1D_ARRAY', GLtexture),
+        ('GL_TEXTURE_2D', GLtexture),
+        ('GL_TEXTURE_2D_MULTISAMPLE', GLtexture),
+        ('GL_TEXTURE_2D_ARRAY', GLtexture),
+        ('GL_TEXTURE_RECTANGLE', GLtexture),
+        ('GL_TEXTURE_CUBE_MAP', GLtexture),
+        ('GL_TEXTURE_CUBE_MAP_POSITIVE_X', GLtexture),
+        ('GL_TEXTURE_CUBE_MAP_NEGATIVE_X', GLtexture),
+        ('GL_TEXTURE_CUBE_MAP_POSITIVE_Y', GLtexture),
+        ('GL_TEXTURE_CUBE_MAP_NEGATIVE_Y', GLtexture),
+        ('GL_TEXTURE_CUBE_MAP_POSITIVE_Z', GLtexture),
+        ('GL_TEXTURE_CUBE_MAP_NEGATIVE_Z', GLtexture),
+        ('GL_TEXTURE_CUBE_MAP_ARRAY', GLtexture),
+        ('GL_TEXTURE_3D', GLtexture),
+        ('GL_RENDERBUFFER', GLrenderbuffer),
+        ('GL_FRAMEBUFFER', GLframebuffer),
+        ('GL_DISPLAY_LIST', GLlist),
+        ('GL_FENCE_APPLE', GLfence),
+        ('GL_DRAW_PIXELS_APPLE', GLuint), # GL_APPLE_fence
+    ], GLuint)
+
 
 # GL_AMD_performance_monitor
 GLperfMonitorCounterInfoAMD = Polymorphic('pname', [