diff options
| author | Vladimir Dergachev <volodya@freedesktop.org> | 2005-01-09 23:37:03 +0000 |
|---|---|---|
| committer | Vladimir Dergachev <volodya@freedesktop.org> | 2005-01-09 23:37:03 +0000 |
| commit | 8ad31013b2d540645c14f37587ec6b418b865b03 (patch) | |
| tree | 5493e214d553730cf9a9bb9127adf3a80955d969 /src/mesa/drivers/dri/r300/r300_render.c | |
| parent | e9acd0ca5f0449588e3772024546e107b1e807c4 (diff) | |
Port EmitPixelShader from cmdbuf.c to SetupPixelShader in state.c.
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, 3 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c index 4ca5f0af59..eb1df1dfb5 100644 --- a/src/mesa/drivers/dri/r300/r300_render.c +++ b/src/mesa/drivers/dri/r300/r300_render.c @@ -298,8 +298,8 @@ static GLboolean r300_run_immediate_render(GLcontext *ctx, | R300_VPORT_Y_SCALE_ENA | R300_VPORT_Y_OFFSET_ENA | R300_VTX_W0_FMT; - #endif R300_STATECHANGE(rmesa, vte); + #endif /* Magic register - note it is right after 20b0 */ @@ -308,15 +308,12 @@ static GLboolean r300_run_immediate_render(GLcontext *ctx, reg_start(0x20b4,0); e32(0x0000000c); - assign_pipeline(rmesa, &SINGLE_TEXTURE_PIPELINE); - } else { - assign_pipeline(rmesa, &FLAT_COLOR_PIPELINE); } - + r300SetupVertexShader(rmesa); + r300SetupPixelShader(rmesa); r300EmitState(rmesa); - r300EmitPixelShader(rmesa); #if 0 reg_start(R300_RB3D_COLORMASK, 0); |