summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2016-06-20 17:40:23 +1000
committerTimothy Arceri <[email protected]>2016-06-21 12:43:18 +1000
commit644e015f0b9236e955d679cac4bcc7a1523fc475 (patch)
treed25340fb0c32bf0bc20868bfba4d1a6f8efff0f6
parent82e0bbd01abfb2073519941d9893fa6ac05fb58c (diff)
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]>
-rw-r--r--src/mesa/drivers/dri/i965/brw_tcs.c5
1 files 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 8a5dd7e31cd..548dc75276c 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;