summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2011-06-01 01:09:11 +0200
committerMarek Olšák <[email protected]>2011-06-01 04:47:41 +0200
commit37a85b1830188503feb286ebdee0cdb44fa298af (patch)
treef780f8c71b2e6bb52819f360d7fc8b95c4637d16
parentc5903ed4541ec4f9389e33ba27c9527afa87ec44 (diff)
r300g: remove unused debug option DBG_UPLOAD
And renumber the options.
-rw-r--r--src/gallium/drivers/r300/r300_debug.c3
-rw-r--r--src/gallium/drivers/r300/r300_screen.h23
2 files changed, 11 insertions, 15 deletions
diff --git a/src/gallium/drivers/r300/r300_debug.c b/src/gallium/drivers/r300/r300_debug.c
index 3ab28689fb8..9a0052ac6d1 100644
--- a/src/gallium/drivers/r300/r300_debug.c
+++ b/src/gallium/drivers/r300/r300_debug.c
@@ -27,7 +27,7 @@
#include <stdio.h>
static const struct debug_named_value debug_options[] = {
- { "info", DBG_INFO, "Print hardware info"},
+ { "info", DBG_INFO, "Print hardware info (printed by default on debug builds"},
{ "fp", DBG_FP, "Log fragment program compilation" },
{ "vp", DBG_VP, "Log vertex program compilation" },
{ "pstat", DBG_P_STAT, "Log vertex/fragment program stats" },
@@ -41,7 +41,6 @@ static const struct debug_named_value debug_options[] = {
{ "fb", DBG_FB, "Log framebuffer" },
{ "cbzb", DBG_CBZB, "Log fast color clear info" },
{ "hyperz", DBG_HYPERZ, "Log HyperZ info" },
- { "upload", DBG_UPLOAD, "Log user buffer upload info" },
{ "scissor", DBG_SCISSOR, "Log scissor info" },
{ "anisohq", DBG_ANISOHQ, "Use high quality anisotropic filtering" },
{ "notiling", DBG_NO_TILING, "Disable tiling" },
diff --git a/src/gallium/drivers/r300/r300_screen.h b/src/gallium/drivers/r300/r300_screen.h
index 3bafd0f8142..e5c53bf3500 100644
--- a/src/gallium/drivers/r300/r300_screen.h
+++ b/src/gallium/drivers/r300/r300_screen.h
@@ -88,23 +88,20 @@ radeon_winsys(struct pipe_screen *screen) {
#define DBG_TEX (1 << 5)
#define DBG_TEXALLOC (1 << 6)
#define DBG_RS (1 << 7)
-/* gap - fill it */
-#define DBG_FB (1 << 9)
-#define DBG_RS_BLOCK (1 << 10)
-#define DBG_CBZB (1 << 11)
-#define DBG_HYPERZ (1 << 12)
-#define DBG_SCISSOR (1 << 13)
-#define DBG_UPLOAD (1 << 14)
-#define DBG_INFO (1 << 15)
+#define DBG_FB (1 << 8)
+#define DBG_RS_BLOCK (1 << 9)
+#define DBG_CBZB (1 << 10)
+#define DBG_HYPERZ (1 << 11)
+#define DBG_SCISSOR (1 << 12)
+#define DBG_INFO (1 << 13)
/* Features. */
#define DBG_ANISOHQ (1 << 16)
#define DBG_NO_TILING (1 << 17)
#define DBG_NO_IMMD (1 << 18)
-/* gap - fill it */
-#define DBG_NO_OPT (1 << 20)
-#define DBG_NO_CBZB (1 << 21)
-#define DBG_NO_ZMASK (1 << 22)
-#define DBG_NO_HIZ (1 << 23)
+#define DBG_NO_OPT (1 << 19)
+#define DBG_NO_CBZB (1 << 20)
+#define DBG_NO_ZMASK (1 << 21)
+#define DBG_NO_HIZ (1 << 22)
/* Statistics. */
#define DBG_P_STAT (1 << 25)
/*@}*/