commit 35b25362b205e375f425acb60fcd96a158edc729
author Mark Janes <markjanes@swizzler.org> Thu Jan 02 20:47:44 2020 -0800
committer Commit Bot <commit-bot@chromium.org> Wed Jun 03 22:05:45 2020 +0000
tree 300562987fee6bd3e3f2ea2b3950a52cb4c4c859
parent 95feab722a439c859a1b1383b0f0aa52a35b1d80

glretrace: Support traces which query uniform block names by index

Apitrace supports titles which query the index for a given uniform
block name.  Alternatively, titles may iterate active uniform block
indices and retrieve the name at each index.

To support this method of identifying uniform block bindings,
glGetActiveUniformBlockName must be checked against the return value
that was traced.

Enables retracing of Bioshock6, which queries names by index.  Without
this patch, a trace made on Linux will not retrace on Windows.

Change-Id: Ib711f06ee8d0f91253cee8b737210e63b4cba8b6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/apitrace/+/2224516
Reviewed-by: Po-Hsien Wang <pwang@chromium.org>
Commit-Queue: Ilja H. Friedel <ihf@chromium.org>
Commit-Queue: Robert Tarasov <tutankhamen@chromium.org>
Tested-by: Ilja H. Friedel <ihf@chromium.org>
Tested-by: Robert Tarasov <tutankhamen@chromium.org>

specs/glapi.py

diff --git a/specs/glapi.py b/specs/glapi.py
index a263ceb..5f2a4a0 100644
--- a/specs/glapi.py
+++ b/specs/glapi.py
@@ -1667,7 +1667,7 @@
     GlFunction(Void, "glGetActiveUniformName", [(GLprogram, "program"), (GLuint, "uniformIndex"), (GLsizei, "bufSize"), Out(Pointer(GLsizei), "length"), OutGlString(GLchar, "length", "uniformName")], sideeffects=False),
     GlFunction(GLuniformBlock, "glGetUniformBlockIndex", [(GLprogram, "program"), (GLstringConst, "uniformBlockName")]),
     GlFunction(Void, "glGetActiveUniformBlockiv", [(GLprogram, "program"), (GLuniformBlock, "uniformBlockIndex"), (GLenum, "pname"), Out(OpaqueArray(GLint, "_glGetActiveUniformBlockiv_size(pname)"), "params")], sideeffects=False),
-    GlFunction(Void, "glGetActiveUniformBlockName", [(GLprogram, "program"), (GLuniformBlock, "uniformBlockIndex"), (GLsizei, "bufSize"), Out(Pointer(GLsizei), "length"), OutGlString(GLchar, "length", "uniformBlockName")], sideeffects=False),
+    GlFunction(Void, "glGetActiveUniformBlockName", [(GLprogram, "program"), (GLuniformBlock, "uniformBlockIndex"), (GLsizei, "bufSize"), Out(Pointer(GLsizei), "length"), OutGlString(GLchar, "length", "uniformBlockName")]),
     GlFunction(Void, "glUniformBlockBinding", [(GLprogram, "program"), (GLuniformBlock, "uniformBlockIndex"), (GLuint, "uniformBlockBinding")]),
 
     # GL_ARB_vertex_array_object