Mesa (master): mesa: remove the unused _mesa_UpdateTexEnvProgram() function

Brian Paul brianp at kemper.freedesktop.org
Tue Feb 10 23:31:26 UTC 2009


Module: Mesa
Branch: master
Commit: 9fd26daec24f21dbe17afcb2e2ab272667ee9a69
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9fd26daec24f21dbe17afcb2e2ab272667ee9a69

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Feb 10 16:30:24 2009 -0700

mesa: remove the unused _mesa_UpdateTexEnvProgram() function

---

 src/mesa/main/texenvprogram.c |   36 ------------------------------------
 src/mesa/main/texenvprogram.h |    2 --
 2 files changed, 0 insertions(+), 38 deletions(-)

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 066f3bd..d1f0340 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -1261,39 +1261,3 @@ _mesa_get_fixed_func_fragment_program(GLcontext *ctx)
 
    return prog;
 }
-
-
-
-/**
- * If _MaintainTexEnvProgram is set we'll generate a fragment program that
- * implements the current texture env/combine mode.
- * This function generates that program and puts it into effect.
- */
-void
-_mesa_UpdateTexEnvProgram( GLcontext *ctx )
-{
-   const struct gl_fragment_program *prev = ctx->FragmentProgram._Current;
-	
-   ASSERT(ctx->FragmentProgram._MaintainTexEnvProgram);
-
-   /* If a conventional fragment program/shader isn't in effect... */
-   if (!ctx->FragmentProgram._Enabled &&
-       (!ctx->Shader.CurrentProgram ||
-        !ctx->Shader.CurrentProgram->FragmentProgram) ) 
-   {
-      struct gl_fragment_program *newProg;
-
-      newProg = _mesa_get_fixed_func_fragment_program(ctx);
-
-      _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current, newProg);
-      _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._TexEnvProgram, newProg);
-   } 
-
-   /* Tell the driver about the change.  Could define a new target for
-    * this?
-    */
-   if (ctx->FragmentProgram._Current != prev && ctx->Driver.BindProgram) {
-      ctx->Driver.BindProgram(ctx, GL_FRAGMENT_PROGRAM_ARB,
-                         (struct gl_program *) ctx->FragmentProgram._Current);
-   }
-}
diff --git a/src/mesa/main/texenvprogram.h b/src/mesa/main/texenvprogram.h
index a7aa60c..0a162d2 100644
--- a/src/mesa/main/texenvprogram.h
+++ b/src/mesa/main/texenvprogram.h
@@ -32,6 +32,4 @@
 extern struct gl_fragment_program *
 _mesa_get_fixed_func_fragment_program(GLcontext *ctx);
 
-extern void _mesa_UpdateTexEnvProgram( GLcontext *ctx );
-
 #endif




More information about the mesa-commit mailing list