From fc455797c1b20d989e705d05bb165fa32bc360d0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mathias=20Fr=C3=B6hlich?= Date: Sun, 12 May 2019 10:35:52 +0200 Subject: [PATCH] mesa: Set _NEW_VARYING_VP_INPUTS iff varying_vp_inputs are set. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák Signed-off-by: Mathias Fröhlich --- src/mesa/main/state.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) 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; } } -- 2.30.2