Missing setups that cause all kinds of problems with hw tnl.

diff --git a/src/mesa/drivers/dri/r300/r300_reg.h b/src/mesa/drivers/dri/r300/r300_reg.h
index cd72856c7131d0518c33a5df12f19487350b80eb..040e69517b5351b06c6dfbfc7023bb9463316fa9 100644 (file)
--- 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 8f09288a3f4bfd2fc7b55749c1ba53536381367d..4a827ace7671ff704acad6bc4c84f1372ff3d99e 100644 (file)
--- 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);