From 7c1f8b63ad5a8d3e2fb36eae51881f437f988d09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Tue, 23 Aug 2022 16:59:18 -0400
Subject: [PATCH] glthread: work around GL_INVALID_OPERATION with OpenGL ES 1.x
 draws

GLES1 only has (Multi)Draw{Array,Elements}, but glthread converts them
to the more complicated versions and then calls them through the dispatch,
which generated GL_INVALID_OPERATION.

Luckily, we can export them with the Internal prefix, so they are unlikely
to be used by apps by accident.

Acked-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18223>
---
 src/mapi/glapi/gen/gl_API.xml | 44 +++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 1d21f3a72db..35bbac8c8d1 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -12863,6 +12863,50 @@
 </category>
 
 <category name="GL_MESA_internal_functions">
+    <!-- These functions exist because glthread converts all draws to these
+         and then calls them through the dispatch table, so this is a workaround
+         for the GL_INVALID_OPERATION errors with OpenGL ES 1.x. -->
+    <function name="InternalDrawArraysInstancedBaseInstance" es1="1.0"
+              alias="DrawArraysInstancedBaseInstance">
+        <param name="mode" type="GLenum"/>
+        <param name="first" type="GLint"/>
+        <param name="count" type="GLsizei"/>
+        <param name="instancecount" type="GLsizei"/>
+        <param name="baseinstance" type="GLuint"/>
+    </function>
+
+    <function name="InternalDrawElementsInstancedBaseVertexBaseInstance" es1="1.0"
+              alias="DrawElementsInstancedBaseVertexBaseInstance">
+        <param name="mode" type="GLenum"/>
+        <param name="count" type="GLsizei"/>
+        <param name="type" type="GLenum"/>
+        <param name="indices" type="const GLvoid *"/>
+        <param name="instancecount" type="GLsizei"/>
+        <param name="basevertex" type="GLint"/>
+        <param name="baseinstance" type="GLuint"/>
+    </function>
+
+    <function name="InternalDrawRangeElementsBaseVertex" es1="1.0"
+              alias="DrawRangeElementsBaseVertex">
+        <param name="mode" type="GLenum"/>
+        <param name="start" type="GLuint"/>
+        <param name="end" type="GLuint"/>
+        <param name="count" type="GLsizei"/>
+        <param name="type" type="GLenum"/>
+        <param name="indices" type="const GLvoid *"/>
+        <param name="basevertex" type="GLint"/>
+    </function>
+
+    <function name="InternalMultiDrawElementsBaseVertex" es1="1.0"
+              alias="MultiDrawElementsBaseVertex">
+        <param name="mode" type="GLenum"/>
+        <param name="count" type="const GLsizei *"/>
+        <param name="type" type="GLenum"/>
+        <param name="indices" type="const GLvoid * const *"/>
+        <param name="primcount" type="GLsizei"/>
+        <param name="basevertex" type="const GLint *"/>
+    </function>
+
     <!-- Internal function for glthread to implement BufferSubData as a GPU copy. -->
     <function name="InternalBufferSubDataCopyMESA" es2="2.0">
         <param name="srcBuffer" type="GLintptr"/> <!-- "struct gl_buffer_object *" really -->