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.
This commit is contained in:
@@ -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;
|
||||
|
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user