glthread: remove debug_print_marshal function

We don't need to print every function we execute.

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

diff --git a/src/mapi/glapi/gen/gl_marshal.py b/src/mapi/glapi/gen/gl_marshal.py
index 02c94dd74dbd31aa72c1f0fe6be3a60ec9fe17d2..ce5cbb275e3f94621b16d170251906417bd8f8fa 100644 (file)
--- a/src/mapi/glapi/gen/gl_marshal.py
+++ b/src/mapi/glapi/gen/gl_marshal.py
@@ -261,8 +261,6 @@ class PrintCode(gl_XML.gl_print_base):
             out('int cmd_size = {0};'.format(' + '.join(size_terms)))
             out('{0} *cmd;'.format(struct))
 
             out('int cmd_size = {0};'.format(' + '.join(size_terms)))
             out('{0} *cmd;'.format(struct))
 

-            out('debug_print_marshal("{0}");'.format(func.name))
-

             self.validate_count_or_fallback(func)
 
             if func.marshal_fail:
             self.validate_count_or_fallback(func)
 
             if func.marshal_fail:

diff --git a/src/mesa/main/marshal.c b/src/mesa/main/marshal.c
index b2935f63753aa0486ea172b94ab6ca36155e6717..ab6a7d6e290f84b4b426423c9ceb5de9edb0d002 100644 (file)
--- a/src/mesa/main/marshal.c
+++ b/src/mesa/main/marshal.c
@@ -248,7 +248,6 @@ _mesa_marshal_BufferData_merged(GLuint target_or_name, GLsizeiptr size,
                        target_or_name == GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD;
    bool copy_data = data && !external_mem;
    int cmd_size = sizeof(struct marshal_cmd_BufferData) + (copy_data ? size : 0);
                        target_or_name == GL_EXTERNAL_VIRTUAL_MEMORY_BUFFER_AMD;
    bool copy_data = data && !external_mem;
    int cmd_size = sizeof(struct marshal_cmd_BufferData) + (copy_data ? size : 0);

-   debug_print_marshal("BufferData");

 
    if (unlikely(size < 0 || size > INT_MAX || cmd_size < 0 ||
                 cmd_size > MARSHAL_MAX_CMD_SIZE ||
 
    if (unlikely(size < 0 || size > INT_MAX || cmd_size < 0 ||
                 cmd_size > MARSHAL_MAX_CMD_SIZE ||


@@ -362,7 +361,6 @@ _mesa_marshal_BufferSubData_merged(GLuint target_or_name, GLintptr offset,
 {
    GET_CURRENT_CONTEXT(ctx);
    size_t cmd_size = sizeof(struct marshal_cmd_BufferSubData) + size;
 {
    GET_CURRENT_CONTEXT(ctx);
    size_t cmd_size = sizeof(struct marshal_cmd_BufferSubData) + size;

-   debug_print_marshal(func);

 
    if (unlikely(size < 0 || size > INT_MAX || cmd_size < 0 ||
                 cmd_size > MARSHAL_MAX_CMD_SIZE || !data ||
 
    if (unlikely(size < 0 || size > INT_MAX || cmd_size < 0 ||
                 cmd_size > MARSHAL_MAX_CMD_SIZE || !data ||

diff --git a/src/mesa/main/marshal.h b/src/mesa/main/marshal.h
index acc6a02b920b6e14662429a489d6fa895b4d4fce..c28d7f37637424aea045f9dc19a26a65d3977479 100644 (file)
--- a/src/mesa/main/marshal.h
+++ b/src/mesa/main/marshal.h
@@ -139,13 +139,6 @@ debug_print_sync(const char *func)
 #endif
 }
 
 #endif
 }
 

-static inline void
-debug_print_marshal(const char *func)
-{
-#if DEBUG_MARSHAL_PRINT_CALLS
-   printf("marshal: %s\n", func);
-#endif
-}

 
 struct _glapi_table *
 _mesa_create_marshal_table(const struct gl_context *ctx);
 
 struct _glapi_table *
 _mesa_create_marshal_table(const struct gl_context *ctx);