From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 18 Dec 2008 01:05:03 +0000 (-0700)
Subject: mesa: remove unneeded _mesa_reference_fragprog() call
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=60410fc8587ce2bf09a5dc5d744268aa83701522;p=mesa.git

mesa: remove unneeded _mesa_reference_fragprog() call

The subsequent if/else cases always call _mesa_reference_fragprog() anyway.
---

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 0d452fd8791..3c111759d27 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -190,8 +190,8 @@ update_program(GLcontext *ctx)
 
    /*
     * Set the ctx->VertexProgram._Current and ctx->FragmentProgram._Current
-    * pointers to the programs that should be enabled/used.  These will only
-    * be NULL if we need to use the fixed-function code.
+    * pointers to the programs that should be used for rendering.  If either
+    * is NULL, use fixed-function code paths.
     *
     * These programs may come from several sources.  The priority is as
     * follows:
@@ -204,8 +204,6 @@ update_program(GLcontext *ctx)
     * come up, or matter.
     */
 
-   _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current, NULL);
-
    if (shProg && shProg->LinkStatus && shProg->FragmentProgram) {
       /* Use shader programs */
       _mesa_reference_fragprog(ctx, &ctx->FragmentProgram._Current,