aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2020-03-06 14:20:05 -0500
committerMarek Olšák <[email protected]>2020-03-20 23:01:13 -0400
commit01a50e2493dec462b75e827fb09a815a67f027a0 (patch)
tree1fda5b48a3444a73aa41fcf3dd322ff9aaacad07 /src
parentaee004a7c8900938d1c17f0ac299d40001b383b0 (diff)
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 <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4124>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/glthread.h1
-rw-r--r--src/mesa/main/marshal.c15
2 files changed, 0 insertions, 16 deletions
diff --git a/src/mesa/main/glthread.h b/src/mesa/main/glthread.h
index 34af466d685..d8e9c3da84a 100644
--- 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 ab6a7d6e290..cbcb7c58750 100644
--- 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