diff options
| author | Aapo Tahkola <[email protected]> | 2005-05-06 03:18:40 +0000 |
|---|---|---|
| committer | Aapo Tahkola <[email protected]> | 2005-05-06 03:18:40 +0000 |
| commit | 4a55d4ffa704956c8eed5a78aea847e7de06d5c3 (patch) | |
| tree | d4744299928e3f9b1e1d5ddbce058a5c286f8dce | |
| parent | 6258b76c49f49a56a7c713914b798e80c6553b06 (diff) | |
Missing setups that cause all kinds of problems with hw tnl.
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_reg.h | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_render.c | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_reg.h b/src/mesa/drivers/dri/r300/r300_reg.h index cd72856c713..040e69517b5 100644 --- a/src/mesa/drivers/dri/r300/r300_reg.h +++ b/src/mesa/drivers/dri/r300/r300_reg.h @@ -1216,6 +1216,7 @@ I am fairly certain that they are correct unless stated otherwise in comments. #define R300_VPI_OUT_OP_EX2 (75 << 0) #define R300_VPI_OUT_OP_LG2 (76 << 0) #define R300_VPI_OUT_OP_MAD_2 (128 << 0) +#define R300_VPI_OUT_OP_UNK129 (129 << 0) /* all temps, vector(scalar, vector, vector) */ #define R300_VPI_OUT_REG_CLASS_TEMPORARY (0 << 8) #define R300_VPI_OUT_REG_CLASS_RESULT (2 << 8) diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c index 8f09288a3f4..4a827ace767 100644 --- a/src/mesa/drivers/dri/r300/r300_render.c +++ b/src/mesa/drivers/dri/r300/r300_render.c @@ -757,6 +757,11 @@ static GLboolean r300_run_tcl_render(GLcontext *ctx, if(ctx->VertexProgram._Enabled == GL_FALSE){ _tnl_UpdateFixedFunctionProgram(ctx); r300ProgramStringNotify(ctx, GL_VERTEX_PROGRAM_ARB, &ctx->_TnlProgram); + r300_setup_textures(ctx); + r300_setup_rs_unit(ctx); + + r300SetupVertexShader(rmesa); + r300SetupPixelShader(rmesa); } return r300_run_vb_render(ctx, stage); |