Mesa (master): st/mesa: remove less useful debug options in hot paths
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Dec 7 21:18:16 UTC 2020
Module: Mesa
Branch: master
Commit: a33dbba26147b3fad94146f384bbf14feaca2c3e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a33dbba26147b3fad94146f384bbf14feaca2c3e
Author: Marek Olšák <marek.olsak at amd.com>
Date: Tue Nov 24 00:11:48 2020 -0500
st/mesa: remove less useful debug options in hot paths
Reviewed-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7826>
---
src/mesa/state_tracker/st_atom_constbuf.c | 7 -------
src/mesa/state_tracker/st_debug.c | 6 ------
src/mesa/state_tracker/st_debug.h | 22 ++++++++--------------
src/mesa/state_tracker/st_draw.c | 20 --------------------
4 files changed, 8 insertions(+), 47 deletions(-)
diff --git a/src/mesa/state_tracker/st_atom_constbuf.c b/src/mesa/state_tracker/st_atom_constbuf.c
index fd13ed4eb28..5907ed6cee4 100644
--- a/src/mesa/state_tracker/st_atom_constbuf.c
+++ b/src/mesa/state_tracker/st_atom_constbuf.c
@@ -96,13 +96,6 @@ st_upload_constants(struct st_context *st, struct gl_program *prog)
_mesa_shader_write_subroutine_indices(st->ctx, stage);
- if (ST_DEBUG & DEBUG_CONSTANTS) {
- debug_printf("%s(shader=%d, numParams=%d, stateFlags=0x%x)\n",
- __func__, shader_type, params->NumParameters,
- params->StateFlags);
- _mesa_print_parameter_list(params);
- }
-
cb.buffer = NULL;
cb.user_buffer = NULL;
cb.buffer_offset = 0;
diff --git a/src/mesa/state_tracker/st_debug.c b/src/mesa/state_tracker/st_debug.c
index 4505d2b8e10..786e1cf0906 100644
--- a/src/mesa/state_tracker/st_debug.c
+++ b/src/mesa/state_tracker/st_debug.c
@@ -47,13 +47,7 @@ static const struct debug_named_value st_debug_flags[] = {
{ "mesa", DEBUG_MESA, NULL },
{ "tgsi", DEBUG_PRINT_IR, NULL },
{ "nir", DEBUG_PRINT_IR, NULL },
- { "constants",DEBUG_CONSTANTS, NULL },
- { "pipe", DEBUG_PIPE, NULL },
- { "tex", DEBUG_TEX, NULL },
{ "fallback", DEBUG_FALLBACK, NULL },
- { "screen", DEBUG_SCREEN, NULL },
- { "query", DEBUG_QUERY, NULL },
- { "draw", DEBUG_DRAW, NULL },
{ "buffer", DEBUG_BUFFER, NULL },
{ "wf", DEBUG_WIREFRAME, NULL },
{ "precompile", DEBUG_PRECOMPILE, NULL },
diff --git a/src/mesa/state_tracker/st_debug.h b/src/mesa/state_tracker/st_debug.h
index 6e4b397da0d..520ee995165 100644
--- a/src/mesa/state_tracker/st_debug.h
+++ b/src/mesa/state_tracker/st_debug.h
@@ -34,20 +34,14 @@
struct st_context;
-#define DEBUG_MESA 0x1
-#define DEBUG_PRINT_IR 0x2
-#define DEBUG_CONSTANTS 0x4
-#define DEBUG_PIPE 0x8
-#define DEBUG_TEX 0x10
-#define DEBUG_FALLBACK 0x20
-#define DEBUG_QUERY 0x40
-#define DEBUG_SCREEN 0x80
-#define DEBUG_DRAW 0x100
-#define DEBUG_BUFFER 0x200
-#define DEBUG_WIREFRAME 0x400
-#define DEBUG_PRECOMPILE 0x800
-#define DEBUG_GREMEDY 0x1000
-#define DEBUG_NOREADPIXCACHE 0x2000
+#define DEBUG_MESA BITFIELD_BIT(0)
+#define DEBUG_PRINT_IR BITFIELD_BIT(1)
+#define DEBUG_FALLBACK BITFIELD_BIT(2)
+#define DEBUG_BUFFER BITFIELD_BIT(3)
+#define DEBUG_WIREFRAME BITFIELD_BIT(4)
+#define DEBUG_PRECOMPILE BITFIELD_BIT(5)
+#define DEBUG_GREMEDY BITFIELD_BIT(6)
+#define DEBUG_NOREADPIXCACHE BITFIELD_BIT(7)
extern int ST_DEBUG;
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index 9f74b813c50..f6efb88f1e2 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -222,14 +222,6 @@ st_draw_vbo(struct gl_context *ctx,
info.max_index = draw.start + draw.count - 1;
}
- if (ST_DEBUG & DEBUG_DRAW) {
- debug_printf("st/draw: mode %s start %u count %u index_size %d\n",
- u_prim_name(info.mode),
- draw.start,
- draw.count,
- info.index_size);
- }
-
/* Don't call u_trim_pipe_prim. Drivers should do it if they need it. */
cso_draw_vbo(st->cso_context, &info, NULL, draw);
}
@@ -279,13 +271,6 @@ st_indirect_draw_vbo(struct gl_context *ctx,
indirect.buffer = st_buffer_object(indirect_data)->buffer;
indirect.offset = indirect_offset;
- if (ST_DEBUG & DEBUG_DRAW) {
- debug_printf("st/draw indirect: mode %s drawcount %d index_size %d\n",
- u_prim_name(info.mode),
- draw_count,
- info.index_size);
- }
-
if (!st->has_multi_draw_indirect) {
int i;
@@ -327,11 +312,6 @@ st_draw_transform_feedback(struct gl_context *ctx, GLenum mode,
info.vertices_per_patch = ctx->TessCtrlProgram.patch_vertices;
info.instance_count = num_instances;
- if (ST_DEBUG & DEBUG_DRAW) {
- debug_printf("st/draw transform feedback: mode %s\n",
- u_prim_name(info.mode));
- }
-
/* Transform feedback drawing is always non-indexed. */
/* Set info.count_from_stream_output. */
if (!st_transform_feedback_draw_init(tfb_vertcount, stream, &indirect))
More information about the mesa-commit
mailing list