diff options
| author | Vladimir Dergachev <volodya@freedesktop.org> | 2005-01-09 22:38:53 +0000 |
|---|---|---|
| committer | Vladimir Dergachev <volodya@freedesktop.org> | 2005-01-09 22:38:53 +0000 |
| commit | e9acd0ca5f0449588e3772024546e107b1e807c4 (patch) | |
| tree | fbad21dba83263c089f5436f2b4a0bcad9390418 /src/mesa/drivers/dri/r300/r300_render.c | |
| parent | 527af7571ef1ccfc772f444224e55534bf9dffe3 (diff) | |
Implement a more elaborate hashing scheme for texture formats. Still not perfect.
Transform EmitVertexShader in cmdbuf.c to SetupVertexShader in state.c.
The latter is only temporary and is to be rewritten to auto-generate shaders based on current GL context.
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_render.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_render.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c index b7f99f6637..4ca5f0af59 100644 --- a/src/mesa/drivers/dri/r300/r300_render.c +++ b/src/mesa/drivers/dri/r300/r300_render.c @@ -301,7 +301,6 @@ static GLboolean r300_run_immediate_render(GLcontext *ctx, #endif R300_STATECHANGE(rmesa, vte); - r300EmitState(rmesa); /* Magic register - note it is right after 20b0 */ @@ -313,18 +312,10 @@ static GLboolean r300_run_immediate_render(GLcontext *ctx, } else { assign_pipeline(rmesa, &FLAT_COLOR_PIPELINE); } - - rmesa->state.vertex_shader.matrix[0].length=16; - memcpy(rmesa->state.vertex_shader.matrix[0].body.f, ctx->_ModelProjectMatrix.m, 16*4); - - rmesa->state.vertex_shader.unknown2.length=4; - rmesa->state.vertex_shader.unknown2.body.f[0]=0.0; - rmesa->state.vertex_shader.unknown2.body.f[1]=0.0; - rmesa->state.vertex_shader.unknown2.body.f[2]=1.0; - rmesa->state.vertex_shader.unknown2.body.f[3]=0.0; - - - r300EmitVertexShader(rmesa); + + r300SetupVertexShader(rmesa); + + r300EmitState(rmesa); r300EmitPixelShader(rmesa); #if 0 @@ -576,7 +567,7 @@ static GLboolean r300_run_render(GLcontext *ctx, #define FALLBACK_IF(expr) \ do { \ if (expr) { \ - if (RADEON_DEBUG & DEBUG_FALLBACKS) \ + if (1 || RADEON_DEBUG & DEBUG_FALLBACKS) \ fprintf(stderr, "%s: fallback:%s\n", \ __FUNCTION__, #expr); \ stage->active = GL_FALSE; \ |