r300g: drop DBG_CS

I'd like the CS macros to be as lightweight as possible for performance
reasons.

diff --git a/src/gallium/drivers/r300/r300_cs.h b/src/gallium/drivers/r300/r300_cs.h
index 866b9a1..9b8dfc6 100644 (file)
--- a/src/gallium/drivers/r300/r300_cs.h
+++ b/src/gallium/drivers/r300/r300_cs.h
@@ -32,11 +32,6 @@
  * that they neatly hide away, and don't have the cost of function setup,so
  * we're going to use them. */
 
-#define MAX_CS_SIZE 64 * 1024 / 4
-
-#define VERY_VERBOSE_CS 1
-#define VERY_VERBOSE_REGISTERS 1
-
 /* XXX stolen from radeon_reg.h */
 #define RADEON_CP_PACKET0 0x0
 
@@ -50,35 +45,22 @@
 
 #define BEGIN_CS(size) do { \
     assert(r300_check_cs(cs_context_copy, (size))); \
-    if (VERY_VERBOSE_CS) { \
-        DBG(cs_context_copy, DBG_CS, "r300: BEGIN_CS, count %d, in %s (%s:%d)\n", \
-                size, __FUNCTION__, __FILE__, __LINE__); \
-    } \
     cs_winsys->begin_cs(cs_winsys, (size), \
             __FILE__, __FUNCTION__, __LINE__); \
     cs_count = size; \
 } while (0)
 
 #define OUT_CS(value) do { \
-    if (VERY_VERBOSE_CS || VERY_VERBOSE_REGISTERS) { \
-        DBG(cs_context_copy, DBG_CS, "r300: writing %08x\n", value); \
-    } \
     cs_winsys->write_cs_dword(cs_winsys, (value)); \
     cs_count--; \
 } while (0)
 
 #define OUT_CS_32F(value) do { \
-    if (VERY_VERBOSE_CS || VERY_VERBOSE_REGISTERS) { \
-        DBG(cs_context_copy, DBG_CS, "r300: writing %f\n", value); \
-    } \
     cs_winsys->write_cs_dword(cs_winsys, fui(value)); \
     cs_count--; \
 } while (0)
 
 #define OUT_CS_REG(register, value) do { \
-    if (VERY_VERBOSE_REGISTERS) \
-        DBG(cs_context_copy, DBG_CS, "r300: writing 0x%08X to register 0x%04X\n", \
-            value, register); \
     assert(register); \
     cs_winsys->write_cs_dword(cs_winsys, CP_PACKET0(register, 0)); \
     cs_winsys->write_cs_dword(cs_winsys, value); \
@@ -88,25 +70,17 @@
 /* Note: This expects count to be the number of registers,
  * not the actual packet0 count! */
 #define OUT_CS_REG_SEQ(register, count) do { \
-    if (VERY_VERBOSE_REGISTERS) \
-        DBG(cs_context_copy, DBG_CS, "r300: writing register sequence of %d to 0x%04X\n", \
-            count, register); \
     assert(register); \
     cs_winsys->write_cs_dword(cs_winsys, CP_PACKET0((register), ((count) - 1))); \
     cs_count--; \
 } while (0)
 
 #define OUT_CS_TABLE(values, count) do { \
-    if (VERY_VERBOSE_REGISTERS) \
-        DBG(cs_context_copy, DBG_CS, "r300: writing table of %d dwords\n", count); \
     cs_winsys->write_cs_table(cs_winsys, values, count); \
     cs_count -= count; \
 } while (0)
 
 #define OUT_CS_BUF_RELOC(bo, offset, rd, wd, flags) do { \
-    DBG(cs_context_copy, DBG_CS, "r300: writing relocation for buffer %p, offset %d, " \
-            "domains (%d, %d, %d)\n", \
-        bo, offset, rd, wd, flags); \
     assert(bo); \
     cs_winsys->write_cs_dword(cs_winsys, offset); \
     r300_buffer_write_reloc(cs_winsys, r300_buffer(bo), rd, wd, flags);        \
@@ -115,9 +89,6 @@
 
 
 #define OUT_CS_TEX_RELOC(tex, offset, rd, wd, flags) do { \
-    DBG(cs_context_copy, DBG_CS, "r300: writing relocation for texture %p, offset %d, " \
-            "domains (%d, %d, %d)\n", \
-        tex, offset, rd, wd, flags); \
     assert(tex); \
     cs_winsys->write_cs_dword(cs_winsys, offset); \
     r300_texture_write_reloc(cs_winsys, tex, rd, wd, flags);   \
@@ -126,29 +97,18 @@
 
 
 #define OUT_CS_BUF_RELOC_NO_OFFSET(bo, rd, wd, flags) do { \
-    DBG(cs_context_copy, DBG_CS, "r300: writing relocation for buffer %p, " \
-            "domains (%d, %d, %d)\n", \
-        bo, rd, wd, flags); \
     assert(bo); \
     r300_buffer_write_reloc(cs_winsys, r300_buffer(bo), rd, wd, flags);        \
     cs_count -= 2; \
 } while (0)
 
 #define END_CS do { \
-    if (VERY_VERBOSE_CS) { \
-        DBG(cs_context_copy, DBG_CS, "r300: END_CS in %s (%s:%d)\n", __FUNCTION__, \
-                __FILE__, __LINE__); \
-    } \
     if (cs_count != 0) \
         debug_printf("r300: Warning: cs_count off by %d\n", cs_count); \
     cs_winsys->end_cs(cs_winsys, __FILE__, __FUNCTION__, __LINE__); \
 } while (0)
 
 #define FLUSH_CS do { \
-    if (VERY_VERBOSE_CS) { \
-        DBG(cs_context_copy, DBG_CS, "r300: FLUSH_CS in %s (%s:%d)\n\n", __FUNCTION__, \
-                __FILE__, __LINE__); \
-    } \
     if (SCREEN_DBG_ON(r300->screen, DBG_STATS)) { \
         r300->flush_counter++; \
     } \
@@ -158,9 +118,6 @@
 #define RADEON_ONE_REG_WR        (1 << 15)
 
 #define OUT_CS_ONE_REG(register, count) do { \
-    if (VERY_VERBOSE_REGISTERS) \
-        DBG(cs_context_copy, DBG_CS, "r300: writing data sequence of %d to 0x%04X\n", \
-            count, register); \
     assert(register); \
     cs_winsys->write_cs_dword(cs_winsys, CP_PACKET0((register), ((count) - 1)) | RADEON_ONE_REG_WR); \
     cs_count--; \
@@ -175,8 +132,6 @@
 } while (0)
 
 #define OUT_CS_INDEX_RELOC(bo, offset, count, rd, wd, flags) do { \
-    DBG(cs_context_copy, DBG_CS, "r300: writing relocation for index buffer %p," \
-            "offset %d\n", bo, offset); \
     assert(bo); \
     cs_winsys->write_cs_dword(cs_winsys, offset); \
     cs_winsys->write_cs_dword(cs_winsys, count); \

diff --git a/src/gallium/drivers/r300/r300_debug.c b/src/gallium/drivers/r300/r300_debug.c
index 297791f..abf3296 100644 (file)
--- a/src/gallium/drivers/r300/r300_debug.c
+++ b/src/gallium/drivers/r300/r300_debug.c
@@ -29,7 +29,6 @@
 static const struct debug_named_value debug_options[] = {
     { "fp", DBG_FP, "Fragment program handling (for debugging)" },
     { "vp", DBG_VP, "Vertex program handling (for debugging)" },
-    { "cs", DBG_CS, "Command submissions (for debugging)" },
     { "draw", DBG_DRAW, "Draw and emit (for debugging)" },
     { "tex", DBG_TEX, "Textures (for debugging)" },
     { "texalloc", DBG_TEXALLOC, "Texture allocation (for debugging)" },

diff --git a/src/gallium/drivers/r300/r300_screen.h b/src/gallium/drivers/r300/r300_screen.h
index 2949202..16888ea 100644 (file)
--- a/src/gallium/drivers/r300/r300_screen.h
+++ b/src/gallium/drivers/r300/r300_screen.h
@@ -65,7 +65,7 @@ static INLINE struct r300_screen* r300_screen(struct pipe_screen* screen) {
 /* Logging. */
 #define DBG_FP          (1 << 1)
 #define DBG_VP          (1 << 2)
-#define DBG_CS          (1 << 3)
+/* The bit (1 << 3) is unused. */
 #define DBG_DRAW        (1 << 4)
 #define DBG_TEX         (1 << 5)
 #define DBG_TEXALLOC    (1 << 6)