draw: Properly limit vertex buffer fetches on draw arrays.

[mesa.git] / src / gallium / drivers / r300 / r300_cs.h

diff --git a/src/gallium/drivers/r300/r300_cs.h b/src/gallium/drivers/r300/r300_cs.h
index 2e52dfa43c6a17e36e1c6ec040f712f2407b141c..c208e672f42194876603293cecf1eadafeaa608d 100644 (file)
--- a/src/gallium/drivers/r300/r300_cs.h
+++ b/src/gallium/drivers/r300/r300_cs.h
@@ -29,7 +29,6 @@
 
 #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
@@ -40,14 +39,14 @@
  */
 
 #define CS_LOCALS(context) \
-    struct r300_winsys_cs *cs_copy = (context)->cs; \
-    struct r300_winsys_screen *cs_winsys = (context)->rws; \
+    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(size <= (R300_MAX_CMDBUF_DWORDS - cs_copy->cdw)); \
+    assert(size <= (RADEON_MAX_CMDBUF_DWORDS - cs_copy->cdw)); \
     cs_count = size; \
 } while (0)