Use SecondaryColorPtr, not ColorPtr[1] (the latter is NULL).

This fixes segfault in tuxracer-demo. It locks up after this though.

diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c
index d1dd82ad919f30bed82039f0ab07a28df9c0c81b..f4596aad6395f5afe1d07f61fb3aa87d92e1fbfd 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_render.c
+++ b/src/mesa/drivers/dri/r300/r300_render.c
@@ -248,7 +248,7 @@ static void r300_render_immediate_primitive(r300ContextPtr rmesa,
                if(tnl->render_inputs & _TNL_BIT_COLOR0)
                        output_vector(VB->ColorPtr[0], i);
                if(tnl->render_inputs & _TNL_BIT_COLOR1)
-                       output_vector(VB->ColorPtr[1], i);
+                       output_vector(VB->SecondaryColorPtr[0], i);
 
                if(tnl->render_inputs & _TNL_BIT_FOG)
                        output_vector(VB->FogCoordPtr, i);

diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index dedc5df0a8aed05b0e116470b656dc2dce553854..3e7a4653e5b7666265afff9dd1510cfcefb0f8b8 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -846,7 +846,7 @@ void r300_setup_routing(GLcontext *ctx, GLboolean immediate)
        if(tnl->render_inputs & _TNL_BIT_COLOR0)
                CONFIGURE_AOS(VB->ColorPtr[0], 0, i_color[0], AOS_FORMAT_FLOAT_COLOR);
        if(tnl->render_inputs & _TNL_BIT_COLOR1)
-               CONFIGURE_AOS(VB->ColorPtr[1], 0, i_color[1], AOS_FORMAT_FLOAT_COLOR);
+               CONFIGURE_AOS(VB->SecondaryColorPtr[0], 0, i_color[1], AOS_FORMAT_FLOAT_COLOR);
 
        if(tnl->render_inputs & _TNL_BIT_FOG)
                CONFIGURE_AOS(VB->FogCoordPtr, 0, i_fog, AOS_FORMAT_FLOAT);

diff --git a/src/mesa/drivers/dri/r300/r300_texmem.c b/src/mesa/drivers/dri/r300/r300_texmem.c
index 926031c805158c613850d2b850c1348d3fd5a857..49631d6b9ff25ed787c72cc1be60a24afee1761e 100644 (file)
--- a/src/mesa/drivers/dri/r300/r300_texmem.c
+++ b/src/mesa/drivers/dri/r300/r300_texmem.c
@@ -406,7 +406,7 @@ static void uploadSubImage(r300ContextPtr rmesa, r300TexObjPtr t,
        } while (ret && errno == EAGAIN);
 
        UNLOCK_HARDWARE(&rmesa->radeon);
-
+       
        if (ret) {
                fprintf(stderr, "DRM_RADEON_TEXTURE: return = %d\n", ret);
                fprintf(stderr, "   offset=0x%08x\n", offset);