summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorMathias Fröhlich <[email protected]>2019-05-12 10:35:52 +0200
committerMathias Fröhlich <[email protected]>2019-05-14 18:09:49 +0200
commit663f93c8691e09902376aec8901ff1df123d9f2a (patch)
tree3d4069a87e81c59a8d828a891f9e85b6e716151f /src/mesa/main
parentdf50af19d30f9ecc07e567911293601ed08fe94e (diff)
mesa: Fix test for setting the _NEW_VARYING_VP_INPUTS flag.
The precondition stated in the comment is not true. The values mentioned are only set from _mesa_update_state which in turn may not yet be called. For now set the _NEW_VARYING_VP_INPUTS flag a bit more often, we will narrow that down to a minimum again in a later patch. Reviewed-by: Marek Olšák <[email protected]> Signed-off-by: Mathias Fröhlich <[email protected]>
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/state.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 217232bcdad..3ca6f58c6a6 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -430,14 +430,9 @@ set_varying_vp_inputs(struct gl_context *ctx, GLbitfield varying_inputs)
if (ctx->varying_vp_inputs != varying_inputs) {
ctx->varying_vp_inputs = varying_inputs;
- /* Only the fixed-func generated programs need to use the flag
- * and the fixed-func fragment program uses it only if there is also
- * a fixed-func vertex program, so this only depends on the latter.
- *
- * It's okay to check the VP pointer here, because this is called after
- * _mesa_update_state in the vbo module. */
- if (ctx->VertexProgram._TnlProgram ||
- ctx->FragmentProgram._TexEnvProgram) {
+ /* 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);*/