commit 6ccf5bbdafd3c3ea767e0622e3f098067b010664
author Robert Tarasov <tutankhamen@chromium.org> Fri Jan 10 12:31:25 2020 -0800
committer Commit Bot <commit-bot@chromium.org> Fri Jan 17 19:59:07 2020 +0000
tree 02e5188a9df80e9b0c63a435ed4f62132c4b6808
parent 9ac802ed5a99cf91b437660cef83afa9190c8827

Merge the upstream repository into ChromeOS fork

BUG=b:147513762
TEST=Built and tested locally for x86

Change-Id: I2d40e6b5d57dd8ae49e54f20370374aa6b29c8c0
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/apitrace/+/1995362
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Ilja H. Friedel <ihf@chromium.org>
Commit-Queue: Robert Tarasov <tutankhamen@chromium.org>
Tested-by: Robert Tarasov <tutankhamen@chromium.org>

specs/glapi.py

diff --git a/specs/glapi.py b/specs/glapi.py
index 15fac63..a2032b5 100644
--- a/specs/glapi.py
+++ b/specs/glapi.py
@@ -1287,8 +1287,8 @@
     GlFunction(Void, "glProgramUniform4ui64vARB", [(GLprogram, "program"), (GLlocation, "location"), (GLsizei, "count"), (Array(Const(GLuint64), "count*4"), "value")]),
 
     # GL_ARB_indirect_parameters
-    GlFunction(Void, "glMultiDrawArraysIndirectCountARB", [(GLenum_mode, "mode"), (GLintptr, "indirect"), (GLintptr, "drawcount"), (GLsizei, "maxdrawcount"), (GLsizei, "stride")]),
-    GlFunction(Void, "glMultiDrawElementsIndirectCountARB", [(GLenum_mode, "mode"), (GLenum, "type"), (GLintptr, "indirect"), (GLintptr, "drawcount"), (GLsizei, "maxdrawcount"), (GLsizei, "stride")]),
+    GlFunction(Void, "glMultiDrawArraysIndirectCountARB", [(GLenum_mode, "mode"), (GLpointerConst, "indirect"), (GLintptr, "drawcount"), (GLsizei, "maxdrawcount"), (GLsizei, "stride")]),
+    GlFunction(Void, "glMultiDrawElementsIndirectCountARB", [(GLenum_mode, "mode"), (GLenum, "type"), (GLpointerConst, "indirect"), (GLintptr, "drawcount"), (GLsizei, "maxdrawcount"), (GLsizei, "stride")]),
 
     # GL_ARB_instanced_arrays
     GlFunction(Void, "glVertexAttribDivisorARB", [(GLuint, "index"), (GLuint, "divisor")]),