Module: Mesa Branch: master Commit: 644e015f0b9236e955d679cac4bcc7a1523fc475 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=644e015f0b9236e955d679cac4bcc7a1523fc475
Author: Timothy Arceri <[email protected]> Date: Mon Jun 20 17:40:23 2016 +1000 i965: get PrimitiveMode from the program rather than the shader struct This is more consistent with what we do elsewhere and will allow us to only cache one of the values in the shader cache. Reviewed-by: Iago Toral Quiroga <[email protected]> --- src/mesa/drivers/dri/i965/brw_tcs.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_tcs.c b/src/mesa/drivers/dri/i965/brw_tcs.c index 8a5dd7e..548dc75 100644 --- a/src/mesa/drivers/dri/i965/brw_tcs.c +++ b/src/mesa/drivers/dri/i965/brw_tcs.c @@ -393,9 +393,8 @@ brw_tcs_precompile(struct gl_context *ctx, if (brw->gen < 8) key.input_vertices = shader_prog->TessCtrl.VerticesOut; - key.tes_primitive_mode = - shader_prog->_LinkedShaders[MESA_SHADER_TESS_EVAL] ? - shader_prog->TessEval.PrimitiveMode : GL_TRIANGLES; + key.tes_primitive_mode = brw->tess_eval_program ? + brw->tess_eval_program->PrimitiveMode : GL_TRIANGLES; key.outputs_written = prog->OutputsWritten; key.patch_outputs_written = prog->PatchOutputsWritten; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
