OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Marek Olšák
2020-03-06 14:20:05 -05:00
parent aee004a7c8
commit 01a50e2493
2 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/mesa/main/glthread.h
View File

@@ -48,7 +48,6 @@
#include "util/u_queue.h" #include "util/u_queue.h"
#include "GL/gl.h" #include "GL/gl.h"
enum marshal_dispatch_cmd_id;
struct gl_context; struct gl_context;
struct _mesa_HashTable; struct _mesa_HashTable;

15
src/mesa/main/marshal.c
View File

@@ -32,18 +32,6 @@
#include "marshal.h" #include "marshal.h"
#include "dispatch.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_ShaderSource
{ {
struct marshal_cmd_base cmd_base; 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]); memcpy(cmd_strings, string[i], cmd_length[i]);
cmd_strings += cmd_length[i]; cmd_strings += cmd_length[i];
} }
_mesa_post_marshal_hook(ctx);
} else { } else {
_mesa_glthread_finish(ctx); _mesa_glthread_finish(ctx);
CALL_ShaderSource(ctx->CurrentServerDispatch, CALL_ShaderSource(ctx->CurrentServerDispatch,
@@ -279,7 +266,6 @@ _mesa_marshal_BufferData_merged(GLuint target_or_name, GLsizeiptr size,
char *variable_data = (char *) (cmd + 1); char *variable_data = (char *) (cmd + 1);
memcpy(variable_data, data, size); memcpy(variable_data, data, size);
} }
_mesa_post_marshal_hook(ctx);
} }
void GLAPIENTRY void GLAPIENTRY
@@ -387,7 +373,6 @@ _mesa_marshal_BufferSubData_merged(GLuint target_or_name, GLintptr offset,
char *variable_data = (char *) (cmd + 1); char *variable_data = (char *) (cmd + 1);
memcpy(variable_data, data, size); memcpy(variable_data, data, size);
_mesa_post_marshal_hook(ctx);
} }
void GLAPIENTRY void GLAPIENTRY