gallium/u_dump: add and use util_dump_transfer_usage
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
diff --git a/src/gallium/auxiliary/util/u_debug.c b/src/gallium/auxiliary/util/u_debug.c
index dd3e167..866cfbd 100644
--- a/src/gallium/auxiliary/util/u_debug.c
+++ b/src/gallium/auxiliary/util/u_debug.c
@@ -31,6 +31,7 @@
#include "pipe/p_compiler.h"
#include "util/u_debug.h"
+#include "util/u_dump.h"
#include "pipe/p_format.h"
#include "pipe/p_state.h"
#include "util/u_inlines.h"
@@ -484,21 +485,9 @@
void
debug_print_transfer_flags(const char *msg, unsigned usage)
{
- static const struct debug_named_value names[] = {
- DEBUG_NAMED_VALUE(PIPE_TRANSFER_READ),
- DEBUG_NAMED_VALUE(PIPE_TRANSFER_WRITE),
- DEBUG_NAMED_VALUE(PIPE_TRANSFER_MAP_DIRECTLY),
- DEBUG_NAMED_VALUE(PIPE_TRANSFER_DISCARD_RANGE),
- DEBUG_NAMED_VALUE(PIPE_TRANSFER_DONTBLOCK),
- DEBUG_NAMED_VALUE(PIPE_TRANSFER_UNSYNCHRONIZED),
- DEBUG_NAMED_VALUE(PIPE_TRANSFER_FLUSH_EXPLICIT),
- DEBUG_NAMED_VALUE(PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE),
- DEBUG_NAMED_VALUE(PIPE_TRANSFER_PERSISTENT),
- DEBUG_NAMED_VALUE(PIPE_TRANSFER_COHERENT),
- DEBUG_NAMED_VALUE_END
- };
-
- debug_printf("%s: %s\n", msg, debug_dump_flags(names, usage));
+ debug_printf("%s: ", msg);
+ util_dump_transfer_usage(stdout, usage);
+ printf("\n");
}
diff --git a/src/gallium/auxiliary/util/u_dump.h b/src/gallium/auxiliary/util/u_dump.h
index be9a0fa..8c1a8f3 100644
--- a/src/gallium/auxiliary/util/u_dump.h
+++ b/src/gallium/auxiliary/util/u_dump.h
@@ -102,6 +102,9 @@
void
util_dump_query_value_type(FILE *stream, unsigned value);
+void
+util_dump_transfer_usage(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 e87e530..e431cd9 100644
--- a/src/gallium/auxiliary/util/u_dump_defines.c
+++ b/src/gallium/auxiliary/util/u_dump_defines.c
@@ -29,6 +29,7 @@
#include "util/u_memory.h"
#include "util/u_debug.h"
#include "util/u_dump.h"
+#include "util/u_math.h"
#if 0
@@ -89,6 +90,41 @@
return util_dump_enum_continuous(value, ARRAY_SIZE(util_##_name##_names), util_##_name##_names); \
}
+static void
+util_dump_flags_continuous(FILE *stream, unsigned value, unsigned num_names,
+ const char * const *names)
+{
+ unsigned unknown = 0;
+ bool first = true;
+
+ while (value) {
+ int i = u_bit_scan(&value);
+ if (i >= num_names || !names[i])
+ unknown |= 1u << i;
+ if (!first)
+ fputs("|", stream);
+ fputs(names[i], stream);
+ first = false;
+ }
+
+ if (unknown) {
+ if (!first)
+ fputs("|", stream);
+ fprintf(stream, "%x", unknown);
+ first = false;
+ }
+
+ if (first)
+ fputs("0", stream);
+}
+
+#define DEFINE_UTIL_DUMP_FLAGS_CONTINUOUS(_name) \
+void \
+util_dump_##_name(FILE *stream, unsigned value) \
+{ \
+ util_dump_flags_continuous(stream, value, ARRAY_SIZE(util_##_name##_names), \
+ util_##_name##_names); \
+}
static const char *
util_blend_factor_names[] = {
@@ -470,3 +506,20 @@
{
fprintf(stream, "%s", util_str_query_value_type(value, false));
}
+
+
+static const char * const
+util_transfer_usage_names[] = {
+ "PIPE_TRANSFER_READ",
+ "PIPE_TRANSFER_WRITE",
+ "PIPE_TRANSFER_MAP_DIRECTLY",
+ "PIPE_TRANSFER_DISCARD_RANGE",
+ "PIPE_TRANSFER_DONTBLOCK",
+ "PIPE_TRANSFER_UNSYNCHRONIZED",
+ "PIPE_TRANSFER_FLUSH_EXPLICIT",
+ "PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE",
+ "PIPE_TRANSFER_PERSISTENT",
+ "PIPE_TRANSFER_COHERENT",
+};
+
+DEFINE_UTIL_DUMP_FLAGS_CONTINUOUS(transfer_usage)
diff --git a/src/gallium/auxiliary/util/u_dump_state.c b/src/gallium/auxiliary/util/u_dump_state.c
index a2543be..2725d50 100644
--- a/src/gallium/auxiliary/util/u_dump_state.c
+++ b/src/gallium/auxiliary/util/u_dump_state.c
@@ -812,7 +812,7 @@
util_dump_member(stream, ptr, state, resource);
util_dump_member(stream, uint, state, level);
- util_dump_member(stream, uint, state, usage);
+ util_dump_member(stream, transfer_usage, state, usage);
util_dump_member_begin(stream, "box");
util_dump_box(stream, &state->box);
util_dump_member_end(stream);