glthread: add GL_DRAW_INDIRECT_BUFFER tracking and generator support

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3948>

diff --git a/src/mapi/glapi/gen/marshal_XML.py b/src/mapi/glapi/gen/marshal_XML.py
index d761e58ce830d95ea4d1b57ac19e0f605da5b4fd..5b682c519657acd57dffd893d6d34e670ba48bb4 100644 (file)
--- a/src/mapi/glapi/gen/marshal_XML.py
+++ b/src/mapi/glapi/gen/marshal_XML.py
@@ -77,7 +77,9 @@ class marshal_function(gl_XML.gl_function):
         for p in self.parameters:
             if p.is_output:
                 return 'sync'
         for p in self.parameters:
             if p.is_output:
                 return 'sync'

-            if p.is_pointer() and not (p.count or p.counter) and not (self.marshal == 'draw' and p.name == 'indices'):
+            if (p.is_pointer() and not (p.count or p.counter)
+                and not (self.marshal == 'draw'
+                         and (p.name == 'indices' or p.name == 'indirect'))):

                 return 'sync'
             if p.count_parameter_list:
                 # Parameter size is determined by enums; haven't
                 return 'sync'
             if p.count_parameter_list:
                 # Parameter size is determined by enums; haven't

diff --git a/src/mesa/main/glthread.h b/src/mesa/main/glthread.h
index 021d52130841732d85e1d9f9d5a01b91148899f0..5e99602b4188aa949d88b3a57871197f6cf1ba63 100644 (file)
--- a/src/mesa/main/glthread.h
+++ b/src/mesa/main/glthread.h
@@ -94,6 +94,7 @@ struct glthread_state
     * buffer) binding is in a VBO.
     */
    bool element_array_is_vbo;
     * buffer) binding is in a VBO.
     */
    bool element_array_is_vbo;

+   bool draw_indirect_buffer_is_vbo;

 };
 
 void _mesa_glthread_init(struct gl_context *ctx);
 };
 
 void _mesa_glthread_init(struct gl_context *ctx);

diff --git a/src/mesa/main/marshal.c b/src/mesa/main/marshal.c
index 28054d236c9b1bb3794dbeb8ae65e6059342bbec..24e419ca3375cf04668c8f09bb7f62253481eaa1 100644 (file)
--- a/src/mesa/main/marshal.c
+++ b/src/mesa/main/marshal.c
@@ -252,6 +252,9 @@ track_vbo_binding(struct gl_context *ctx, GLenum target, GLuint buffer)
        */
       glthread->element_array_is_vbo = (buffer != 0);
       break;
        */
       glthread->element_array_is_vbo = (buffer != 0);
       break;

+   case GL_DRAW_INDIRECT_BUFFER:
+      glthread->draw_indirect_buffer_is_vbo = buffer != 0;
+      break;

    }
 }
 
    }
 }
 

diff --git a/src/mesa/main/marshal.h b/src/mesa/main/marshal.h
index c15253f397361e6a164e838788392e243aca2fce..a172ed30043e43b7a9185cc8ef64e2168d7452a6 100644 (file)
--- a/src/mesa/main/marshal.h
+++ b/src/mesa/main/marshal.h
@@ -98,6 +98,25 @@ _mesa_glthread_is_non_vbo_draw_elements(const struct gl_context *ctx)
    return ctx->API != API_OPENGL_CORE && !glthread->element_array_is_vbo;
 }
 
    return ctx->API != API_OPENGL_CORE && !glthread->element_array_is_vbo;
 }
 

+static inline bool
+_mesa_glthread_is_non_vbo_draw_arrays_indirect(const struct gl_context *ctx)
+{
+   struct glthread_state *glthread = ctx->GLThread;
+
+   return ctx->API != API_OPENGL_CORE &&
+          !glthread->draw_indirect_buffer_is_vbo;
+}
+
+static inline bool
+_mesa_glthread_is_non_vbo_draw_elements_indirect(const struct gl_context *ctx)
+{
+   struct glthread_state *glthread = ctx->GLThread;
+
+   return ctx->API != API_OPENGL_CORE &&
+          (!glthread->draw_indirect_buffer_is_vbo ||
+           !glthread->element_array_is_vbo);
+}
+

 #define DEBUG_MARSHAL_PRINT_CALLS 0
 
 /**
 #define DEBUG_MARSHAL_PRINT_CALLS 0
 
 /**