From c571dda1e0929e1e8ff1686994df6601f34c7bf8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Fri, 6 Mar 2020 16:53:54 -0500
Subject: [PATCH] glthread: rename non_vbo helper functions

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4124>
---
 src/mapi/glapi/gen/ARB_base_instance.xml           |  6 +++---
 .../glapi/gen/ARB_draw_elements_base_vertex.xml    |  8 ++++----
 src/mapi/glapi/gen/ARB_draw_indirect.xml           |  8 ++++----
 src/mapi/glapi/gen/ARB_draw_instanced.xml          |  4 ++--
 src/mapi/glapi/gen/ARB_indirect_parameters.xml     |  6 +++---
 src/mapi/glapi/gen/gl_API.xml                      | 14 +++++++-------
 src/mesa/main/glthread_marshal.h                   |  8 ++++----
 7 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/mapi/glapi/gen/ARB_base_instance.xml b/src/mapi/glapi/gen/ARB_base_instance.xml
index 2846e913c06..f9a7661e952 100644
--- a/src/mapi/glapi/gen/ARB_base_instance.xml
+++ b/src/mapi/glapi/gen/ARB_base_instance.xml
@@ -9,7 +9,7 @@
 <category name="GL_ARB_base_instance" number="107">
 
   <function name="DrawArraysInstancedBaseInstance" exec="dynamic" marshal="draw"
-            marshal_sync="_mesa_glthread_is_non_vbo_draw_arrays(ctx)">
+            marshal_sync="_mesa_glthread_has_non_vbo_vertices(ctx)">
     <param name="mode" type="GLenum"/>
     <param name="first" type="GLint"/>
     <param name="count" type="GLsizei"/>
@@ -18,7 +18,7 @@
   </function>
 
   <function name="DrawElementsInstancedBaseInstance" exec="dynamic" marshal="draw"
-            marshal_sync="_mesa_glthread_is_non_vbo_draw_elements(ctx)">
+            marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices(ctx)">
     <param name="mode" type="GLenum"/>
     <param name="count" type="GLsizei"/>
     <param name="type" type="GLenum"/>
@@ -28,7 +28,7 @@
   </function>
 
   <function name="DrawElementsInstancedBaseVertexBaseInstance" exec="dynamic" marshal="draw"
-            marshal_sync="_mesa_glthread_is_non_vbo_draw_elements(ctx)">
+            marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices(ctx)">
     <param name="mode" type="GLenum"/>
     <param name="count" type="GLsizei"/>
     <param name="type" type="GLenum"/>
diff --git a/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml b/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml
index 28d47839433..915501a9c28 100644
--- a/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml
+++ b/src/mapi/glapi/gen/ARB_draw_elements_base_vertex.xml
@@ -9,7 +9,7 @@
 <category name="GL_ARB_draw_elements_base_vertex" number="62">
 
     <function name="DrawElementsBaseVertex" es2="3.2" exec="dynamic" marshal="draw"
-              marshal_sync="_mesa_glthread_is_non_vbo_draw_elements(ctx)">
+              marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices(ctx)">
         <param name="mode" type="GLenum"/>
         <param name="count" type="GLsizei"/>
         <param name="type" type="GLenum"/>
@@ -18,7 +18,7 @@
     </function>
 
     <function name="DrawRangeElementsBaseVertex" es2="3.2" exec="dynamic" marshal="draw"
-              marshal_sync="_mesa_glthread_is_non_vbo_draw_elements(ctx)">
+              marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices(ctx)">
         <param name="mode" type="GLenum"/>
         <param name="start" type="GLuint"/>
         <param name="end" type="GLuint"/>
@@ -29,7 +29,7 @@
     </function>
 
     <function name="MultiDrawElementsBaseVertex" exec="dynamic" marshal="draw"
-              marshal_sync="_mesa_glthread_is_non_vbo_draw_elements(ctx)">
+              marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices(ctx)">
         <param name="mode" type="GLenum"/>
         <param name="count" type="const GLsizei *" count="primcount"/>
         <param name="type" type="GLenum"/>
@@ -39,7 +39,7 @@
     </function>
 
     <function name="DrawElementsInstancedBaseVertex" es2="3.2" exec="dynamic" marshal="draw"
-              marshal_sync="_mesa_glthread_is_non_vbo_draw_elements(ctx)">
+              marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices(ctx)">
         <param name="mode" type="GLenum"/>
         <param name="count" type="GLsizei"/>
         <param name="type" type="GLenum"/>
diff --git a/src/mapi/glapi/gen/ARB_draw_indirect.xml b/src/mapi/glapi/gen/ARB_draw_indirect.xml
index af342eb8683..dc50cc3bd9e 100644
--- a/src/mapi/glapi/gen/ARB_draw_indirect.xml
+++ b/src/mapi/glapi/gen/ARB_draw_indirect.xml
@@ -10,14 +10,14 @@
 
     <function name="DrawArraysIndirect" exec="dynamic" es2="3.1"
               marshal="draw"
-              marshal_sync="_mesa_glthread_is_non_vbo_draw_arrays_indirect(ctx)">
+              marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indirect(ctx)">
         <param name="mode" type="GLenum"/>
         <param name="indirect" type="const GLvoid *"/>
     </function>
 
     <function name="DrawElementsIndirect" exec="dynamic" es2="3.1"
               marshal="draw"
-              marshal_sync="_mesa_glthread_is_non_vbo_draw_elements_indirect(ctx)">
+              marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices_or_indirect(ctx)">
         <param name="mode" type="GLenum"/>
         <param name="type" type="GLenum"/>
         <param name="indirect" type="const GLvoid *"/>
@@ -29,7 +29,7 @@
 <category name="GL_ARB_multi_draw_indirect" number="133">
 
     <function name="MultiDrawArraysIndirect" exec="dynamic" marshal="draw"
-              marshal_sync="_mesa_glthread_is_non_vbo_draw_arrays_indirect(ctx)">
+              marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indirect(ctx)">
         <param name="mode" type="GLenum"/>
         <param name="indirect" type="const GLvoid *"/>
         <param name="primcount" type="GLsizei"/>
@@ -37,7 +37,7 @@
     </function>
 
     <function name="MultiDrawElementsIndirect" exec="dynamic" marshal="draw"
-              marshal_sync="_mesa_glthread_is_non_vbo_draw_elements_indirect(ctx)">
+              marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices_or_indirect(ctx)">
         <param name="mode" type="GLenum"/>
         <param name="type" type="GLenum"/>
         <param name="indirect" type="const GLvoid *"/>
diff --git a/src/mapi/glapi/gen/ARB_draw_instanced.xml b/src/mapi/glapi/gen/ARB_draw_instanced.xml
index bf24fc5709f..52006c223c3 100644
--- a/src/mapi/glapi/gen/ARB_draw_instanced.xml
+++ b/src/mapi/glapi/gen/ARB_draw_instanced.xml
@@ -9,7 +9,7 @@
 <category name="GL_ARB_draw_instanced" number="44">
 
   <function name="DrawArraysInstancedARB" exec="dynamic" marshal="draw"
-            marshal_sync="_mesa_glthread_is_non_vbo_draw_arrays(ctx)">
+            marshal_sync="_mesa_glthread_has_non_vbo_vertices(ctx)">
     <param name="mode" type="GLenum"/>
     <param name="first" type="GLint"/>
     <param name="count" type="GLsizei"/>
@@ -17,7 +17,7 @@
   </function>
 
   <function name="DrawElementsInstancedARB" exec="dynamic" marshal="draw"
-            marshal_sync="_mesa_glthread_is_non_vbo_draw_elements(ctx)">
+            marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices(ctx)">
     <param name="mode" type="GLenum"/>
     <param name="count" type="GLsizei"/>
     <param name="type" type="GLenum"/>
diff --git a/src/mapi/glapi/gen/ARB_indirect_parameters.xml b/src/mapi/glapi/gen/ARB_indirect_parameters.xml
index 89d11746654..7d4f15d8250 100644
--- a/src/mapi/glapi/gen/ARB_indirect_parameters.xml
+++ b/src/mapi/glapi/gen/ARB_indirect_parameters.xml
@@ -9,7 +9,7 @@
     <enum name="PARAMETER_BUFFER_BINDING_ARB"           value="0x80EF"/>
 
     <function name="MultiDrawArraysIndirectCountARB" exec="dynamic" marshal="draw"
-              marshal_sync="_mesa_glthread_is_non_vbo_draw_arrays(ctx)">
+              marshal_sync="_mesa_glthread_has_non_vbo_vertices(ctx)">
         <param name="mode" type="GLenum"/>
         <param name="indirect" type="GLintptr"/>
         <param name="drawcount" type="GLintptr"/>
@@ -17,9 +17,9 @@
         <param name="stride" type="GLsizei"/>
     </function>
 
-    <!-- Use "...vbo_draw_arrays", because indices always come from a buffer object. -->
+    <!-- Use "...has_non_vbo_vertices", because indices always come from a buffer object. -->
     <function name="MultiDrawElementsIndirectCountARB" exec="dynamic" marshal="draw"
-              marshal_sync="_mesa_glthread_is_non_vbo_draw_arrays(ctx)">
+              marshal_sync="_mesa_glthread_has_non_vbo_vertices(ctx)">
         <param name="mode" type="GLenum"/>
         <param name="type" type="GLenum"/>
         <param name="indirect" type="GLintptr"/>
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index aec65155b8e..e1ef6262281 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -3180,7 +3180,7 @@
     </function>
 
     <function name="DrawArrays" es1="1.0" es2="2.0" exec="dynamic" marshal="draw"
-              marshal_sync="_mesa_glthread_is_non_vbo_draw_arrays(ctx)">
+              marshal_sync="_mesa_glthread_has_non_vbo_vertices(ctx)">
         <param name="mode" type="GLenum"/>
         <param name="first" type="GLint"/>
         <param name="count" type="GLsizei"/>
@@ -3188,7 +3188,7 @@
     </function>
 
     <function name="DrawElements" es1="1.0" es2="2.0" exec="dynamic" marshal="draw"
-              marshal_sync="_mesa_glthread_is_non_vbo_draw_elements(ctx)">
+              marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices(ctx)">
         <param name="mode" type="GLenum"/>
         <param name="count" type="GLsizei"/>
         <param name="type" type="GLenum"/>
@@ -3756,7 +3756,7 @@
     </function>
 
     <function name="DrawRangeElements" es2="3.0" exec="dynamic" marshal="draw"
-              marshal_sync="_mesa_glthread_is_non_vbo_draw_elements(ctx)">
+              marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices(ctx)">
         <param name="mode" type="GLenum"/>
         <param name="start" type="GLuint"/>
         <param name="end" type="GLuint"/>
@@ -4756,7 +4756,7 @@
     </function>
 
     <function name="MultiDrawArrays" marshal="draw"
-              marshal_sync="_mesa_glthread_is_non_vbo_draw_arrays(ctx)">
+              marshal_sync="_mesa_glthread_has_non_vbo_vertices(ctx)">
         <param name="mode" type="GLenum"/>
         <param name="first" type="const GLint *" count="primcount"/>
         <param name="count" type="const GLsizei *" count="primcount"/>
@@ -10279,7 +10279,7 @@
     </function>
 
     <function name="MultiDrawElementsEXT" es1="1.0" es2="2.0" exec="dynamic" marshal="draw"
-              marshal_sync="_mesa_glthread_is_non_vbo_draw_elements(ctx)">
+              marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices(ctx)">
         <param name="mode" type="GLenum"/>
         <param name="count" type="const GLsizei *" count="primcount"/>
         <param name="type" type="GLenum"/>
@@ -11394,7 +11394,7 @@
 
 <category name="GL_IBM_multimode_draw_arrays" number="200">
     <function name="MultiModeDrawArraysIBM" marshal="draw"
-              marshal_sync="_mesa_glthread_is_non_vbo_draw_arrays(ctx)">
+              marshal_sync="_mesa_glthread_has_non_vbo_vertices(ctx)">
         <param name="mode" type="const GLenum *" count="primcount"/>
         <param name="first" type="const GLint *" count="primcount"/>
         <param name="count" type="const GLsizei *" count="primcount"/>
@@ -11404,7 +11404,7 @@
     </function>
 
     <function name="MultiModeDrawElementsIBM" marshal="draw"
-              marshal_sync="_mesa_glthread_is_non_vbo_draw_elements(ctx)">
+              marshal_sync="_mesa_glthread_has_non_vbo_vertices_or_indices(ctx)">
         <param name="mode" type="const GLenum *" count="primcount"/>
         <param name="count" type="const GLsizei *" count="primcount"/>
         <param name="type" type="GLenum"/>
diff --git a/src/mesa/main/glthread_marshal.h b/src/mesa/main/glthread_marshal.h
index 3adabb217bb..2e5001b1af7 100644
--- a/src/mesa/main/glthread_marshal.h
+++ b/src/mesa/main/glthread_marshal.h
@@ -78,7 +78,7 @@ _mesa_glthread_allocate_command(struct gl_context *ctx,
  * calls (deprecated and removed in GL core), we just disable threading.
  */
 static inline bool
-_mesa_glthread_is_non_vbo_draw_elements(const struct gl_context *ctx)
+_mesa_glthread_has_non_vbo_vertices_or_indices(const struct gl_context *ctx)
 {
    const struct glthread_state *glthread = &ctx->GLThread;
    struct glthread_vao *vao = glthread->CurrentVAO;
@@ -88,7 +88,7 @@ _mesa_glthread_is_non_vbo_draw_elements(const struct gl_context *ctx)
 }
 
 static inline bool
-_mesa_glthread_is_non_vbo_draw_arrays(const struct gl_context *ctx)
+_mesa_glthread_has_non_vbo_vertices(const struct gl_context *ctx)
 {
    const struct glthread_state *glthread = &ctx->GLThread;
 
@@ -96,7 +96,7 @@ _mesa_glthread_is_non_vbo_draw_arrays(const struct gl_context *ctx)
 }
 
 static inline bool
-_mesa_glthread_is_non_vbo_draw_arrays_indirect(const struct gl_context *ctx)
+_mesa_glthread_has_non_vbo_vertices_or_indirect(const struct gl_context *ctx)
 {
    const struct glthread_state *glthread = &ctx->GLThread;
 
@@ -106,7 +106,7 @@ _mesa_glthread_is_non_vbo_draw_arrays_indirect(const struct gl_context *ctx)
 }
 
 static inline bool
-_mesa_glthread_is_non_vbo_draw_elements_indirect(const struct gl_context *ctx)
+_mesa_glthread_has_non_vbo_vertices_or_indices_or_indirect(const struct gl_context *ctx)
 {
    const struct glthread_state *glthread = &ctx->GLThread;
    struct glthread_vao *vao = glthread->CurrentVAO;
-- 
2.30.2