r300g: various other cleanups

[mesa.git] / src / gallium / drivers / r300 / r300_render.c

diff --git a/src/gallium/drivers/r300/r300_render.c b/src/gallium/drivers/r300/r300_render.c
index 751a7e6d5bd667b50e30d3c9d356eb9e75206896..f6bc68c43ad968b0614a6e1322d14f73ab4194ab 100644 (file)
--- a/src/gallium/drivers/r300/r300_render.c
+++ b/src/gallium/drivers/r300/r300_render.c
@@ -44,7 +44,7 @@
 /* XXX The DRM rejects VAP_ALT_NUM_VERTICES.. */
 //#define ENABLE_ALT_NUM_VERTS
 
-uint32_t r300_translate_primitive(unsigned prim)
+static uint32_t r300_translate_primitive(unsigned prim)
 {
     switch (prim) {
         case PIPE_PRIM_POINTS:
@@ -138,7 +138,7 @@ static boolean immd_is_good_idea(struct r300_context *r300,
     unsigned vertex_element_count = r300->velems->count;
     unsigned i, vbi;
 
-    if (count > 10) {
+    if (count > 10 || DBG_ON(r300, DBG_NO_IMMD)) {
         return FALSE;
     }