summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-10-29 09:23:46 -0600
committerBrian <brian.paul@tungstengraphics.com>2007-10-29 09:25:00 -0600
commit2a3f3679eba802dcb4b46f90c66326c9195cdbcb (patch)
tree1b24bb70ddd802e8fd1a005774ef278641207e00
parenta6a3d8cb755c36d4ae1dc4dbfb310f06862a37b4 (diff)
Disable the else clause which assigns the default fragment program to ctx->FragmentProgram._Current
The _Current field should either point to the fragment program which is to be run (GLSL, ARB_f_p, fixed-func-generated, etc) or be NULL if conventional fixed-function code is to be used. Matches TNL program code.
-rw-r--r--src/mesa/main/texenvprogram.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index abc2567134..21a290402f 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -1279,9 +1279,11 @@ _mesa_UpdateTexEnvProgram( GLcontext *ctx )
_mesa_printf("Found existing texenv program for key %x\n", hash);
}
}
+#if 0
else {
ctx->FragmentProgram._Current = ctx->FragmentProgram.Current;
}
+#endif
/* Tell the driver about the change. Could define a new target for
* this?