summaryrefslogtreecommitdiff
path: root/src/microsoft
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2020-12-17 11:07:30 -0500
committerMarge Bot <eric+marge@anholt.net>2021-01-04 20:51:28 +0000
commit8ddddfb5167e9d26dcf342d5390e702010197208 (patch)
tree9724c4990d20ba224f7eb9ae90530a9e4f173381 /src/microsoft
parentebfe3e7d1b3182c1f10202b143b4bffbf4bcfc30 (diff)
treewide: Disambiguate various variables named "debug_options"
Name them after what they control so 'vi -t' can take you somewhere useful. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8165>
Diffstat (limited to 'src/microsoft')
-rw-r--r--src/microsoft/clc/clc_compiler.c4
-rw-r--r--src/microsoft/clc/compute_test.cpp4
-rw-r--r--src/microsoft/compiler/nir_to_dxil.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/microsoft/clc/clc_compiler.c b/src/microsoft/clc/clc_compiler.c
index 642dca16872..15b1380293c 100644
--- a/src/microsoft/clc/clc_compiler.c
+++ b/src/microsoft/clc/clc_compiler.c
@@ -45,13 +45,13 @@ enum clc_debug_flags {
CLC_DEBUG_VERBOSE = 1 << 1,
};
-static const struct debug_named_value debug_options[] = {
+static const struct debug_named_value clc_debug_options[] = {
{ "dump_spirv", CLC_DEBUG_DUMP_SPIRV, "Dump spirv blobs" },
{ "verbose", CLC_DEBUG_VERBOSE, NULL },
DEBUG_NAMED_VALUE_END
};
-DEBUG_GET_ONCE_FLAGS_OPTION(debug_clc, "CLC_DEBUG", debug_options, 0)
+DEBUG_GET_ONCE_FLAGS_OPTION(debug_clc, "CLC_DEBUG", clc_debug_options, 0)
static void
clc_print_kernels_info(const struct clc_object *obj)
diff --git a/src/microsoft/clc/compute_test.cpp b/src/microsoft/clc/compute_test.cpp
index 647523d3142..6611a96174a 100644
--- a/src/microsoft/clc/compute_test.cpp
+++ b/src/microsoft/clc/compute_test.cpp
@@ -45,7 +45,7 @@ enum compute_test_debug_flags {
COMPUTE_DEBUG_SERIALIZE_LIBCLC = 1 << 3,
};
-static const struct debug_named_value debug_options[] = {
+static const struct debug_named_value compute_debug_options[] = {
{ "experimental_shaders", COMPUTE_DEBUG_EXPERIMENTAL_SHADERS, "Enable experimental shaders" },
{ "use_hw_d3d", COMPUTE_DEBUG_USE_HW_D3D, "Use a hardware D3D device" },
{ "optimize_libclc", COMPUTE_DEBUG_OPTIMIZE_LIBCLC, "Optimize the clc_context before using it" },
@@ -53,7 +53,7 @@ static const struct debug_named_value debug_options[] = {
DEBUG_NAMED_VALUE_END
};
-DEBUG_GET_ONCE_FLAGS_OPTION(debug_compute, "COMPUTE_TEST_DEBUG", debug_options, 0)
+DEBUG_GET_ONCE_FLAGS_OPTION(debug_compute, "COMPUTE_TEST_DEBUG", compute_debug_options, 0)
static void warning_callback(void *priv, const char *msg)
{
diff --git a/src/microsoft/compiler/nir_to_dxil.c b/src/microsoft/compiler/nir_to_dxil.c
index 97334a73329..e59b1b35287 100644
--- a/src/microsoft/compiler/nir_to_dxil.c
+++ b/src/microsoft/compiler/nir_to_dxil.c
@@ -42,7 +42,7 @@
int debug_dxil = 0;
static const struct debug_named_value
-debug_options[] = {
+dxil_debug_options[] = {
{ "verbose", DXIL_DEBUG_VERBOSE, NULL },
{ "dump_blob", DXIL_DEBUG_DUMP_BLOB , "Write shader blobs" },
{ "trace", DXIL_DEBUG_TRACE , "Trace instruction conversion" },
@@ -50,7 +50,7 @@ debug_options[] = {
DEBUG_NAMED_VALUE_END
};
-DEBUG_GET_ONCE_FLAGS_OPTION(debug_dxil, "DXIL_DEBUG", debug_options, 0)
+DEBUG_GET_ONCE_FLAGS_OPTION(debug_dxil, "DXIL_DEBUG", dxil_debug_options, 0)
#define NIR_INSTR_UNSUPPORTED(instr) \
if (debug_dxil & DXIL_DEBUG_VERBOSE) \