From: Keith Whitwell <keith@tungstengraphics.com>
Date: Tue, 10 May 2005 10:25:16 +0000 (+0000)
Subject: Temporary fix - delete and recreate texenvprogram so that drivers
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=586f2c59fe80a31b6342805e6ffc39ca878b098d;p=mesa.git

Temporary fix - delete and recreate texenvprogram so that drivers
notice when it changes.
---

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 1f9d7ae1c50..1618287af6d 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -37,7 +37,7 @@
 #include "shader/arbfragparse.h"
 
 
-#define DISASSEM 0
+#define DISASSEM 1
 
 /* Use uregs to represent registers internally, translate to Mesa's
  * expected formats on emit.  
@@ -172,8 +172,10 @@ static struct ureg get_tex_temp( struct texenv_fragment_program *p )
 
    /* Then any unused temporary:
     */
-   if (!bit)
+   if (!bit) {
       bit = ffs( ~p->temp_flag );
+      p->program->NumTexIndirections++;
+   }
 
    if (!bit) {
       fprintf(stderr, "%s: out of temporaries\n", __FILE__);
@@ -689,9 +691,12 @@ void _mesa_UpdateTexEnvProgram( GLcontext *ctx )
    if (ctx->FragmentProgram._Enabled)
       return;
 
-   if (!ctx->_TexEnvProgram)
-      ctx->_TexEnvProgram = (struct fragment_program *)
-	 ctx->Driver.NewProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, 0);
+   if (ctx->_TexEnvProgram)
+      ctx->Driver.DeleteProgram(ctx, ctx->_TexEnvProgram);
+   
+   ctx->FragmentProgram._Current = ctx->_TexEnvProgram = 
+      (struct fragment_program *)
+      ctx->Driver.NewProgram(ctx, GL_FRAGMENT_PROGRAM_ARB, 0);
 
    p.ctx = ctx;
    p.program = ctx->_TexEnvProgram;