Mesa (master): mesa: small texstate tidy up

[Timothy Arceri]

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

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Tue Apr  4 12:39:31 2017 +1000

mesa: small texstate tidy up

Possibly more efficient, either way it makes the code easier to
follow.

Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

---

 src/mesa/main/texstate.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index ada0dfdb66..aa99b0667c 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -704,13 +704,14 @@ _mesa_update_texture_state(struct gl_context *ctx)
       if (ctx->_Shader->CurrentProgram[i]) {
          prog[i] = ctx->_Shader->CurrentProgram[i];
       } else {
-         if (i == MESA_SHADER_FRAGMENT && ctx->FragmentProgram._Enabled)
-            prog[i] = ctx->FragmentProgram.Current;
-         else
-            prog[i] = NULL;
+         prog[i] = NULL;
       }
    }
 
+   if (prog[MESA_SHADER_FRAGMENT] == NULL && ctx->FragmentProgram._Enabled) {
+      prog[MESA_SHADER_FRAGMENT] = ctx->FragmentProgram.Current;
+   }
+
    /* TODO: only set this if there are actual changes */
    ctx->NewState |= _NEW_TEXTURE_OBJECT | _NEW_TEXTURE_STATE;