summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-10-28 14:32:49 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-10-28 14:32:49 +0000
commitb5ee368baf6472a79d250f0be418200760f4b43d (patch)
tree5851de5f58d12b73c43636bf05ded26385fb8c00 /src/mesa
parentf51bf9e23c4b41ada5edeae91b31f64319534e48 (diff)
TNL module needs to implement ctx->Driver.ProgramStringNotify() function
so that calls to glProgramStringARB() to specify a new program causes the TNL-attached data to get recomputed.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/common/driverfuncs.c2
-rw-r--r--src/mesa/tnl/t_vb_arbprogram.c18
-rw-r--r--src/mesa/tnl/tnl.h2
3 files changed, 22 insertions, 0 deletions
diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 8503135a87..9fe4ee3ad2 100644
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -45,6 +45,7 @@
#endif
#include "driverfuncs.h"
+#include "tnl/tnl.h"
#include "swrast/swrast.h"
@@ -222,6 +223,7 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
driver->NeedFlush = 0;
driver->SaveNeedFlush = 0;
+ driver->ProgramStringNotify = _tnl_program_string;
driver->FlushVertices = NULL;
driver->SaveFlushVertices = NULL;
driver->NotifySaveBegin = NULL;
diff --git a/src/mesa/tnl/t_vb_arbprogram.c b/src/mesa/tnl/t_vb_arbprogram.c
index 08b9ffc889..8b16835677 100644
--- a/src/mesa/tnl/t_vb_arbprogram.c
+++ b/src/mesa/tnl/t_vb_arbprogram.c
@@ -43,6 +43,7 @@
#include "t_pipeline.h"
#include "t_vb_arbprogram.h"
+
#define DISASSEM 0
/*--------------------------------------------------------------------------- */
@@ -1459,3 +1460,20 @@ const struct tnl_pipeline_stage _tnl_arb_vertex_program_stage =
validate_vertex_program, /* validate */
run_arb_vertex_program /* run */
};
+
+
+/**
+ * Called via ctx->Driver.ProgramStringNotify() after a new vertex program
+ * string has been parsed.
+ */
+void
+_tnl_program_string(GLcontext *ctx, GLenum target, struct program *program)
+{
+ if (target == GL_VERTEX_PROGRAM_ARB) {
+ /* free any existing tnl data hanging off the program */
+ struct vertex_program *vprog = (struct vertex_program *) program;
+ if (vprog->TnlData) {
+ free_tnl_data(vprog);
+ }
+ }
+}
diff --git a/src/mesa/tnl/tnl.h b/src/mesa/tnl/tnl.h
index d04310fb53..428fe12788 100644
--- a/src/mesa/tnl/tnl.h
+++ b/src/mesa/tnl/tnl.h
@@ -83,5 +83,7 @@ _tnl_allow_vertex_fog( GLcontext *ctx, GLboolean value );
extern void
_tnl_allow_pixel_fog( GLcontext *ctx, GLboolean value );
+extern void
+_tnl_program_string(GLcontext *ctx, GLenum target, struct program *program);
#endif