diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2013-11-29 16:05:45 +0100 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2013-12-12 18:34:11 +0100 |
| commit | e1374d86fecb58edc9cf9b456b05d74a0034eafd (patch) | |
| tree | fe0060581831e4b601c57f78bcdbf85ddc46f9e4 /src/gallium | |
| parent | 43ea10eb1d6b597b57faaeb5993ca23ed7a537d2 (diff) | |
r600g,radeonsi: consolidate some debug flags
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.c | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.h | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.h | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index 0075ae67c4e..296d4660182 100644 --- 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 4b4d0957dbf..45512639b52 100644 --- 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 6d9434782b8..1ad47e1481b 100644 --- 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 4a5476e5406..e830360d5cf 100644 --- 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; |