diff options
| author | Ben Skeggs <darktama@iinet.net.au> | 2005-02-15 19:07:35 +0000 |
|---|---|---|
| committer | Ben Skeggs <darktama@iinet.net.au> | 2005-02-15 19:07:35 +0000 |
| commit | f44602765670a4ccf284dd71e2b1af5ac9200d03 (patch) | |
| tree | c349c242843293a8952f9c97045b897040565845 /src/mesa/drivers/dri/r300/r300_render.c | |
| parent | 233d93d47e12cd5084be7bed9ae78a05da02085f (diff) | |
Share routing code between immd/vb. Fix breakage of vertex programs in vb mode.
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_render.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_render.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c index 8f9d892982..862fabbc14 100644 --- a/src/mesa/drivers/dri/r300/r300_render.c +++ b/src/mesa/drivers/dri/r300/r300_render.c @@ -485,9 +485,12 @@ static GLboolean r300_run_immediate_render(GLcontext *ctx, efloat(1.0); #endif +/* Setup INPUT_ROUTE and INPUT_CNTL */ + r300EmitArrays(ctx, GL_TRUE); + /* Why do we need this for immediate mode?? Vertex processor needs it to know proper regs */ -// r300EmitLOAD_VBPNTR(rmesa, 0); - +// r300EmitLOAD_VBPNTR(rmesa, 0); + for(i=0; i < VB->PrimitiveCount; i++){ GLuint prim = VB->Primitive[i].mode; GLuint start = VB->Primitive[i].start; @@ -542,7 +545,7 @@ static GLboolean r300_run_vb_render(GLcontext *ctx, r300ReleaseArrays(ctx); - r300EmitArrays(ctx, rmesa->state.render_inputs); + r300EmitArrays(ctx, GL_FALSE); // LOCK_HARDWARE(&(rmesa->radeon)); |