X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fr300%2Fr300_cs.h;h=37f9641ab3e0e3a3fc348210b4fd565f2ffb43c4;hb=a38e8de643fac4990d666cea3da895f9120b9e28;hp=030fad3772fd1452054c142924296334e628905b;hpb=1c0e5ba9f14ec297cbd5055ea402989b2cc71b8d;p=mesa.git

diff --git a/src/gallium/drivers/r300/r300_cs.h b/src/gallium/drivers/r300/r300_cs.h
index 030fad3772f..37f9641ab3e 100644
--- a/src/gallium/drivers/r300/r300_cs.h
+++ b/src/gallium/drivers/r300/r300_cs.h
@@ -29,82 +29,76 @@
 
 #include "r300_reg.h"
 #include "r300_context.h"
-#include "r300_winsys.h"
 
 /* Yes, I know macros are ugly. However, they are much prettier than the code
  * that they neatly hide away, and don't have the cost of function setup,so
  * we're going to use them. */
 
-#ifdef DEBUG
-#define CS_DEBUG(x) x
-#else
-#define CS_DEBUG(x)
-#endif
-
 /**
  * Command submission setup.
  */
 
 #define CS_LOCALS(context) \
-    struct r300_context* const cs_context_copy = (context); \
-    struct r300_winsys_screen *cs_winsys = cs_context_copy->rws; \
-    CS_DEBUG(int cs_count = 0; (void) cs_count;)
+    struct radeon_winsys_cs *cs_copy = (context)->cs; \
+    struct radeon_winsys *cs_winsys = (context)->rws; \
+    int cs_count = 0; (void) cs_count; (void) cs_winsys;
+
+#ifdef DEBUG
 
 #define BEGIN_CS(size) do { \
-    assert(r300_check_cs(cs_context_copy, (size))); \
-    CS_DEBUG(cs_count = size;) \
+    assert(size <= (RADEON_MAX_CMDBUF_DWORDS - cs_copy->cdw)); \
+    cs_count = size; \
 } while (0)
 
 #define END_CS do { \
-    CS_DEBUG(if (cs_count != 0) \
-        debug_printf("r300: Warning: cs_count off by %d\n", cs_count);) \
-    CS_DEBUG(cs_count = 0;) \
+    if (cs_count != 0) \
+        debug_printf("r300: Warning: cs_count off by %d at (%s, %s:%i)\n", \
+                     cs_count, __FUNCTION__, __FILE__, __LINE__); \
+    cs_count = 0; \
 } while (0)
 
+#define CS_USED_DW(x) cs_count -= (x)
+
+#else
+
+#define BEGIN_CS(size)
+#define END_CS
+#define CS_USED_DW(x)
+
+#endif
 
 /**
  * Writing pure DWORDs.
  */
 
 #define OUT_CS(value) do { \
-    cs_winsys->write_cs_dword(cs_winsys, (value)); \
-    CS_DEBUG(cs_count--;) \
+    cs_copy->buf[cs_copy->cdw++] = (value); \
+    CS_USED_DW(1); \
 } while (0)
 
-#define OUT_CS_32F(value) do { \
-    cs_winsys->write_cs_dword(cs_winsys, fui(value)); \
-    CS_DEBUG(cs_count--;) \
-} while (0)
+#define OUT_CS_32F(value) \
+    OUT_CS(fui(value))
 
 #define OUT_CS_REG(register, value) do { \
-    assert(register); \
-    cs_winsys->write_cs_dword(cs_winsys, CP_PACKET0(register, 0)); \
-    cs_winsys->write_cs_dword(cs_winsys, value); \
-    CS_DEBUG(cs_count -= 2;) \
+    OUT_CS(CP_PACKET0(register, 0)); \
+    OUT_CS(value); \
 } while (0)
 
 /* Note: This expects count to be the number of registers,
  * not the actual packet0 count! */
-#define OUT_CS_REG_SEQ(register, count) do { \
-    assert(register); \
-    cs_winsys->write_cs_dword(cs_winsys, CP_PACKET0((register), ((count) - 1))); \
-    CS_DEBUG(cs_count--;) \
-} while (0)
+#define OUT_CS_REG_SEQ(register, count) \
+    OUT_CS(CP_PACKET0((register), ((count) - 1)))
 
-#define OUT_CS_TABLE(values, count) do { \
-    cs_winsys->write_cs_table(cs_winsys, values, count); \
-    CS_DEBUG(cs_count -= count;) \
-} while (0)
+#define OUT_CS_ONE_REG(register, count) \
+    OUT_CS(CP_PACKET0((register), ((count) - 1)) | RADEON_ONE_REG_WR)
 
-#define OUT_CS_ONE_REG(register, count) do { \
-    assert(register); \
-    cs_winsys->write_cs_dword(cs_winsys, CP_PACKET0((register), ((count) - 1)) | RADEON_ONE_REG_WR); \
-    CS_DEBUG(cs_count--;) \
-} while (0)
+#define OUT_CS_PKT3(op, count) \
+    OUT_CS(CP_PACKET3(op, count))
 
-#define OUT_CS_PKT3(op, count) do { \
-    cs_winsys->write_cs_dword(cs_winsys, CP_PACKET3(op, count)); \
-    CS_DEBUG(cs_count--;) \
+#define OUT_CS_TABLE(values, count) do { \
+    memcpy(cs_copy->buf + cs_copy->cdw, (values), (count) * 4); \
+    cs_copy->cdw += (count); \
+    CS_USED_DW(count); \
 } while (0)
 
 
@@ -112,27 +106,11 @@
  * Writing relocations.
  */
 
-#define OUT_CS_RELOC(bo, offset, rd, wd, flags) do { \
-    assert(bo); \
-    cs_winsys->write_cs_dword(cs_winsys, offset); \
-    cs_winsys->write_cs_reloc(cs_winsys, bo, rd, wd, flags); \
-    CS_DEBUG(cs_count -= 3;) \
-} while (0)
-
-#define OUT_CS_BUF_RELOC(bo, offset, rd, wd, flags) do { \
-    assert(bo); \
-    OUT_CS_RELOC(r300_buffer(bo)->buf, offset, rd, wd, flags); \
-} while (0)
-
-#define OUT_CS_TEX_RELOC(tex, offset, rd, wd, flags) do { \
-    assert(tex); \
-    OUT_CS_RELOC(tex->buffer, offset, rd, wd, flags); \
-} while (0)
-
-#define OUT_CS_BUF_RELOC_NO_OFFSET(bo, rd, wd, flags) do { \
-    assert(bo); \
-    cs_winsys->write_cs_reloc(cs_winsys, r300_buffer(bo)->buf, rd, wd, flags); \
-    CS_DEBUG(cs_count -= 2;) \
+#define OUT_CS_RELOC(r) do { \
+    assert((r)); \
+    assert((r)->cs_buf); \
+    OUT_CS(0xc0001000); /* PKT3_NOP */ \
+    OUT_CS(cs_winsys->cs_get_reloc(cs_copy, (r)->cs_buf) * 4); \
 } while (0)
 
 
@@ -141,8 +119,9 @@
  */
 
 #define WRITE_CS_TABLE(values, count) do { \
-    CS_DEBUG(assert(cs_count == 0);) \
-    cs_winsys->write_cs_table(cs_winsys, values, count); \
+    assert(cs_count == 0); \
+    memcpy(cs_copy->buf + cs_copy->cdw, (values), (count) * 4); \
+    cs_copy->cdw += (count); \
 } while (0)
 
 #endif /* R300_CS_H */