AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This fixes segfault in tuxracer-demo. It locks up after this though.
This commit is contained in:
Vladimir Dergachev
2005-01-31 02:52:59 +00:00
parent 15f108335a
commit 9c1773e505
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/dri/r300/r300_render.c
+1 -1
View File
@@ -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);
src/mesa/drivers/dri/r300/r300_state.c
+1 -1
View File
@@ -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);
src/mesa/drivers/dri/r300/r300_texmem.c
+1 -1
View File
@@ -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);