mesa: remove a bunch of gl_renderbuffer fields

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

diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c
index e1a6fae57f380c326fc73e5119689a5ff01518b5..3cd38753b8ad3e2da1a58eae63ae3fa73e0c250a 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_render.c
+++ b/src/mesa/drivers/dri/r300/r300_render.c
@@ -221,7 +221,7 @@ static void r300EmitAOS(r300ContextPtr rmesa, GLuint nr, GLuint offset)
        int sz = 1 + (nr >> 1) * 3 + (nr & 1) * 2;
        int i;
 
-       if (RADEON_DEBUG & DEBUG_VERTS)
+       if (RADEON_DEBUG & RADEON_VERTS)
                fprintf(stderr, "%s: nr=%d, ofs=0x%08x\n", __FUNCTION__, nr,
                        offset);
 
@@ -341,12 +341,6 @@ void r300RunRenderPrimitive(GLcontext * ctx, int start, int end, int prim)
        if (type < 0 || num_verts <= 0)
                return;
 
-       /* Make space for at least 128 dwords.
-        * This is supposed to ensure that we can get all rendering
-        * commands into a single command buffer.
-        */
-       rcommonEnsureCmdBufSpace(&rmesa->radeon, 128, __FUNCTION__);
-
        if (rmesa->ind_buf.bo) {
                GLuint first, incr, offset = 0;
 
@@ -396,7 +390,7 @@ void r300RunRenderPrimitive(GLcontext * ctx, int start, int end, int prim)
                GLuint first, incr, offset = 0;
 
                if (!split_prim_inplace(prim & PRIM_MODE_MASK, &first, &incr) &&
-                       num_verts > 65500) {
+                       num_verts > 65535) {
                        WARN_ONCE("Fixme: can't handle spliting prim %d\n", prim);
                        return;
                }
@@ -453,7 +447,7 @@ void r300SwitchFallback(GLcontext *ctx, uint32_t bit, GLboolean mode)
 
        if (mode) {
                if ((fallback_warn & bit) == 0) {
-                       if (RADEON_DEBUG & DEBUG_FALLBACKS)
+                       if (RADEON_DEBUG & RADEON_FALLBACKS)
                                _mesa_fprintf(stderr, "WARNING! Falling back to software for %s\n", getFallbackString(bit));
                        fallback_warn |= bit;
                }
@@ -481,7 +475,7 @@ void r300SwitchFallback(GLcontext *ctx, uint32_t bit, GLboolean mode)
 
                /* update only if we have disabled all tcl fallbacks */
                if (rmesa->options.hw_tcl_enabled) {
-                       if ((old_fallback & R300_RASTER_FALLBACK_MASK) == bit) {
+                       if ((old_fallback & R300_TCL_FALLBACK_MASK) == bit) {
                                R300_STATECHANGE(rmesa, vap_cntl_status);
                                rmesa->hw.vap_cntl_status.cmd[1] &= ~R300_VAP_TCL_BYPASS;
                        }