From: Timothy Arceri <timothy.arceri@collabora.com>
Date: Mon, 20 Jun 2016 07:40:23 +0000 (+1000)
Subject: i965: get PrimitiveMode from the program rather than the shader struct
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=644e015f0b9236e955d679cac4bcc7a1523fc475;p=mesa.git

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 <itoral@igalia.com>
---

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;