glthread: remove _mesa_post_marshal_hook, because it's not very useful

and also remove the useless forward declaration of enum marshal_dispatch_cmd_id.

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

diff --git a/src/mesa/main/glthread.h b/src/mesa/main/glthread.h
index 34af466d68513045fd4e9095890ee207f873fb2f..d8e9c3da84a77c4dd09153273d7d10adc2c93171 100644 (file)
--- a/src/mesa/main/glthread.h
+++ b/src/mesa/main/glthread.h
@@ -48,7 +48,6 @@
 #include "util/u_queue.h"
 #include "GL/gl.h"
 
-enum marshal_dispatch_cmd_id;
 struct gl_context;
 struct _mesa_HashTable;
 

diff --git a/src/mesa/main/marshal.c b/src/mesa/main/marshal.c
index ab6a7d6e290f84b4b426423c9ceb5de9edb0d002..cbcb7c58750b6f02f9753dc2e65ee1e6dd3291c1 100644 (file)
--- a/src/mesa/main/marshal.c
+++ b/src/mesa/main/marshal.c
@@ -32,18 +32,6 @@
 #include "marshal.h"
 #include "dispatch.h"
 
-static inline void
-_mesa_post_marshal_hook(struct gl_context *ctx)
-{
-   /* This can be enabled for debugging whether a failure is a synchronization
-    * problem between the main thread and the worker thread, or a failure in
-    * how we actually marshal.
-    */
-   if (false)
-      _mesa_glthread_finish(ctx);
-}
-
-
 struct marshal_cmd_ShaderSource
 {
    struct marshal_cmd_base cmd_base;
@@ -126,7 +114,6 @@ _mesa_marshal_ShaderSource(GLuint shader, GLsizei count,
          memcpy(cmd_strings, string[i], cmd_length[i]);
          cmd_strings += cmd_length[i];
       }
-      _mesa_post_marshal_hook(ctx);
    } else {
       _mesa_glthread_finish(ctx);
       CALL_ShaderSource(ctx->CurrentServerDispatch,
@@ -279,7 +266,6 @@ _mesa_marshal_BufferData_merged(GLuint target_or_name, GLsizeiptr size,
       char *variable_data = (char *) (cmd + 1);
       memcpy(variable_data, data, size);
    }
-   _mesa_post_marshal_hook(ctx);
 }
 
 void GLAPIENTRY
@@ -387,7 +373,6 @@ _mesa_marshal_BufferSubData_merged(GLuint target_or_name, GLintptr offset,
 
    char *variable_data = (char *) (cmd + 1);
    memcpy(variable_data, data, size);
-   _mesa_post_marshal_hook(ctx);
 }
 
 void GLAPIENTRY