r600g,radeonsi: consolidate some debug flags

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>

diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index 0075ae67c4e6bd635e303e6435f63afcfb8a809e..296d4660182d28270dbea32fd0fcc59b6fb4d1e1 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -43,14 +43,11 @@
 
 static const struct debug_named_value r600_debug_options[] = {
        /* features */
-       { "nohyperz", DBG_NO_HYPERZ, "Disable Hyper-Z" },
 #if defined(R600_USE_LLVM)
        { "nollvm", DBG_NO_LLVM, "Disable the LLVM shader compiler" },
 #endif
        { "nocpdma", DBG_NO_CP_DMA, "Disable CP DMA" },
        { "nodma", DBG_NO_ASYNC_DMA, "Disable asynchronous DMA" },
-       /* GL uses the word INVALIDATE, gallium uses the word DISCARD */
-       { "noinvalrange", DBG_NO_DISCARD_RANGE, "Disable handling of INVALIDATE_RANGE map flags" },
 
        /* shader backend */
        { "nosb", DBG_NO_SB, "Disable sb backend for graphics shaders" },

diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h
index 4b4d0957dbf71f3ac2a8bac93ae098e8f995270e..45512639b52212102810c287542b0e2a0532033a 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe.h
+++ b/src/gallium/drivers/r600/r600_pipe.h
@@ -192,7 +192,6 @@ struct r600_viewport_state {
 #define DBG_NO_LLVM            (1 << 17)
 #define DBG_NO_CP_DMA          (1 << 18)
 #define DBG_NO_ASYNC_DMA       (1 << 19)
-#define DBG_NO_DISCARD_RANGE   (1 << 20)
 /* shader backend */
 #define DBG_NO_SB              (1 << 21)
 #define DBG_SB_CS              (1 << 22)

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
index 6d9434782b85e7a39aec75b10223a9921b82176a..1ad47e1481b98f64f020978ee0af365337972a04 100644 (file)
--- a/src/gallium/drivers/radeon/r600_pipe_common.c
+++ b/src/gallium/drivers/radeon/r600_pipe_common.c
@@ -45,6 +45,10 @@ static const struct debug_named_value common_debug_options[] = {
        { "ps", DBG_PS, "Print pixel shaders" },
        { "cs", DBG_CS, "Print compute shaders" },
 
+       { "nohyperz", DBG_NO_HYPERZ, "Disable Hyper-Z" },
+       /* GL uses the word INVALIDATE, gallium uses the word DISCARD */
+       { "noinvalrange", DBG_NO_DISCARD_RANGE, "Disable handling of INVALIDATE_RANGE map flags" },
+
        DEBUG_NAMED_VALUE_END /* must be last */
 };
 

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
index 4a5476e54060a8e551467a2d5f5d436eb51584ec..e830360d5cf425ff9716e774b58afc7ac5c5e9c1 100644 (file)
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -74,6 +74,7 @@
 #define DBG_CS                 (1 << 12)
 /* features */
 #define DBG_NO_HYPERZ          (1 << 13)
+#define DBG_NO_DISCARD_RANGE   (1 << 14)
 /* The maximum allowed bit is 15. */
 
 struct r600_common_context;