diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2012-10-01 20:11:38 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2012-10-05 13:19:53 -0700 |
| commit | 7fa0f10cd85ccb5afbc3a961164011de70970ff3 (patch) | |
| tree | 57c37db11b1cc8929e204a4401b84d09d7e11545 /src/mesa/main/state.c | |
| parent | 74b6ea49dfc1b8921de1768da937557150ee7893 (diff) | |
| download | external_mesa3d-7fa0f10cd85ccb5afbc3a961164011de70970ff3.zip external_mesa3d-7fa0f10cd85ccb5afbc3a961164011de70970ff3.tar.gz external_mesa3d-7fa0f10cd85ccb5afbc3a961164011de70970ff3.tar.bz2 | |
mesa: Flag _NEW_VARYING_VP_INPUTS when TexEnv programs are active.
The idea here is to not flag _NEW_VARYING_VP_INPUTS when shaders (either
GLSL or ARB vp/fp) are in use. If either TNL or TexEnv programs are
active, at least one stage is using fixed function.
On Pineview, fixes 20 Piglit, 60 oglconforms, and 7 ES 1.1 conformance
tests, as well as missing textures in Xonotic. These were all
regressions since commit fb4a34e60eb4c1bdc7b0fdcd98d1bf3038c354e8.
NOTE: This is a candidate for the 9.0 branch.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=49127
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=54807
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/mesa/main/state.c')
| -rw-r--r-- | src/mesa/main/state.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index 76946bd..fb8b71c 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -627,7 +627,8 @@ _mesa_set_varying_vp_inputs( struct gl_context *ctx, * * 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) { + if (ctx->VertexProgram._TnlProgram || + ctx->FragmentProgram._TexEnvProgram) { ctx->NewState |= _NEW_VARYING_VP_INPUTS; } /*printf("%s %x\n", __FUNCTION__, varying_inputs);*/ |