diff options
| author | Brian <brian.paul@tungstengraphics.com> | 2007-07-30 13:46:00 -0600 |
|---|---|---|
| committer | Brian <brian.paul@tungstengraphics.com> | 2007-07-30 13:46:00 -0600 |
| commit | 7baa0865b114776cc1672c5e97e63c282e25285f (patch) | |
| tree | 535d69ff7cd50c61475fd6831b4a6cc8b91a743a /src/mesa/state_tracker | |
| parent | 75b8a396e5b29e2ee86ab3a5c9590e6db5d28155 (diff) | |
| parent | 3a35ce336458352653329426c550bfce1ffc3f66 (diff) | |
Merge branch 'softpipe_0_1_branch' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into softpipe_0_1_branch
Diffstat (limited to 'src/mesa/state_tracker')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_program.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_cb_program.c b/src/mesa/state_tracker/st_cb_program.c index fa9eaf446e..6da2aeb2f2 100644 --- a/src/mesa/state_tracker/st_cb_program.c +++ b/src/mesa/state_tracker/st_cb_program.c @@ -153,7 +153,9 @@ void st_init_cb_program( struct st_context *st ) st->ctx->FragmentProgram._MaintainTexEnvProgram = GL_TRUE; st->ctx->FragmentProgram._UseTexEnvProgram = GL_TRUE; +#if 0 assert(functions->ProgramStringNotify == _tnl_program_string); +#endif functions->BindProgram = st_bind_program; functions->NewProgram = st_new_program; functions->DeleteProgram = st_delete_program; |