mesa: set _NEW_VARYING_VP_INPUTS flag only if fixed-func VP is enabled & valid

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Mathias Fröhlich <Mathias.Froehlich@web.de>
This commit is contained in:
Marek Olšák
2012-04-16 16:04:52 +02:00
parent 576c8c592a
commit fb4a34e60e
+10 -1
View File
@@ -627,7 +627,16 @@ _mesa_set_varying_vp_inputs( struct gl_context *ctx,
{
if (ctx->varying_vp_inputs != varying_inputs) {
ctx->varying_vp_inputs = varying_inputs;
ctx->NewState |= _NEW_VARYING_VP_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->NewState |= _NEW_VARYING_VP_INPUTS;
}
/*printf("%s %x\n", __FUNCTION__, varying_inputs);*/
}
}