From aff9c541250575c79f43707e03a3ef114feeebee Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolai=20H=C3=A4hnle?= Date: Thu, 27 Jul 2017 11:50:41 +0200 Subject: [PATCH] gallium: add util_dump_query_type and use it in ddebug MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák --- src/gallium/auxiliary/util/u_dump.h | 2 ++ src/gallium/auxiliary/util/u_dump_defines.c | 10 ++++++++++ src/gallium/drivers/ddebug/dd_draw.c | 12 +----------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/gallium/auxiliary/util/u_dump.h b/src/gallium/auxiliary/util/u_dump.h index de7a451f77d..8ebdafacdcf 100644 --- a/src/gallium/auxiliary/util/u_dump.h +++ b/src/gallium/auxiliary/util/u_dump.h @@ -87,6 +87,8 @@ util_str_query_type(unsigned value, boolean shortened); const char * util_str_prim_mode(unsigned value, boolean shortened); +void +util_dump_query_type(FILE *stream, unsigned value); /* * p_state.h, through a FILE diff --git a/src/gallium/auxiliary/util/u_dump_defines.c b/src/gallium/auxiliary/util/u_dump_defines.c index 098458afb90..c6db2de70b6 100644 --- a/src/gallium/auxiliary/util/u_dump_defines.c +++ b/src/gallium/auxiliary/util/u_dump_defines.c @@ -434,3 +434,13 @@ util_prim_mode_short_names[] = { }; DEFINE_UTIL_STR_CONTINUOUS(prim_mode) + +void +util_dump_query_type(FILE *stream, unsigned value) +{ + if (value >= PIPE_QUERY_DRIVER_SPECIFIC) + fprintf(stream, "PIPE_QUERY_DRIVER_SPECIFIC + %i", + value - PIPE_QUERY_DRIVER_SPECIFIC); + else + fprintf(stream, "%s", util_str_query_type(value, false)); +} diff --git a/src/gallium/drivers/ddebug/dd_draw.c b/src/gallium/drivers/ddebug/dd_draw.c index 3e34f63034e..81a796873f1 100644 --- a/src/gallium/drivers/ddebug/dd_draw.c +++ b/src/gallium/drivers/ddebug/dd_draw.c @@ -179,22 +179,12 @@ util_dump_color_union(FILE *f, const union pipe_color_union *color) color->ui[0], color->ui[1], color->ui[2], color->ui[3]); } -static void -util_dump_query(FILE *f, struct dd_query *query) -{ - if (query->type >= PIPE_QUERY_DRIVER_SPECIFIC) - fprintf(f, "PIPE_QUERY_DRIVER_SPECIFIC + %i", - query->type - PIPE_QUERY_DRIVER_SPECIFIC); - else - fprintf(f, "%s", util_str_query_type(query->type, false)); -} - static void dd_dump_render_condition(struct dd_draw_state *dstate, FILE *f) { if (dstate->render_cond.query) { fprintf(f, "render condition:\n"); - DUMP_M(query, &dstate->render_cond, query); + DUMP_M(query_type, &dstate->render_cond, query->type); DUMP_M(uint, &dstate->render_cond, condition); DUMP_M(uint, &dstate->render_cond, mode); fprintf(f, "\n"); -- 2.30.2