From: Mathias Fröhlich <mathias.froehlich@web.de>
Date: Sun, 12 May 2019 08:35:52 +0000 (+0200)
Subject: mesa: Set _NEW_VARYING_VP_INPUTS iff varying_vp_inputs are set.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fc455797c1b20d989e705d05bb165fa32bc360d0;p=mesa.git

mesa: Set _NEW_VARYING_VP_INPUTS iff varying_vp_inputs are set.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Mathias Fröhlich <Mathias.Froehlich@web.de>
---

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 9d8964952cd..3e2eb28dcc5 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -430,15 +430,14 @@ set_varying_vp_inputs(struct gl_context *ctx, GLbitfield varying_inputs)
    if (VP_MODE_FF != ctx->VertexProgram._VPMode)
       return;
 
+   /* Only fixed-func generated programs ever uses varying_vp_inputs. */
+   if (!ctx->VertexProgram._MaintainTnlProgram &&
+       !ctx->FragmentProgram._MaintainTexEnvProgram)
+      return;
+
    if (ctx->varying_vp_inputs != varying_inputs) {
       ctx->varying_vp_inputs = varying_inputs;
-
-      /* Only fixed-func generated programs ever use varying_vp_inputs. */
-      if (ctx->VertexProgram._MaintainTnlProgram ||
-          ctx->FragmentProgram._MaintainTexEnvProgram) {
-         ctx->NewState |= _NEW_VARYING_VP_INPUTS;
-      }
-      /*printf("%s %x\n", __func__, varying_inputs);*/
+      ctx->NewState |= _NEW_VARYING_VP_INPUTS;
    }
 }