glsl: Expand nested preprocessor macros.

[mesa.git] / src / mesa / tnl / t_vp_build.c

diff --git a/src/mesa/tnl/t_vp_build.c b/src/mesa/tnl/t_vp_build.c
index 5ef0f7e7056e705fa0bec3e5a6aeea49a0c54d0e..735937bbe29e81d638e6b4328d39d0fab360076c 100644 (file)
--- a/src/mesa/tnl/t_vp_build.c
+++ b/src/mesa/tnl/t_vp_build.c
@@ -32,6 +32,7 @@
 
 #include "main/glheader.h"
 #include "main/ffvertex_prog.h"
+#include "main/dd.h"
 #include "t_vp_build.h"
 
 
@@ -44,12 +45,9 @@ void _tnl_UpdateFixedFunctionProgram( GLcontext *ctx )
 
    if (!ctx->VertexProgram._Current ||
        ctx->VertexProgram._Current == ctx->VertexProgram._TnlProgram) {
-      struct gl_vertex_program *newProg;
-
-      newProg = _mesa_get_fixed_func_vertex_program(ctx);
-
-      _mesa_reference_vertprog(ctx, &ctx->VertexProgram._TnlProgram, newProg);
-      _mesa_reference_vertprog(ctx, &ctx->VertexProgram._Current, newProg);
+      ctx->VertexProgram._Current
+         = ctx->VertexProgram._TnlProgram
+         = _mesa_get_fixed_func_vertex_program(ctx);
    }
 
    /* Tell the driver about the change.  Could define a new target for