[Mesa-dev] [PATCH] Revert "i965: get PrimitiveMode from the program rather than the shader struct"

[Andres Gomez]

This reverts commit 644e015f0b9236e955d679cac4bcc7a1523fc475.

PrimitiveMode from the program doesn't hold the proper value when
reaching this code. We rather take it from the linked shader.

Signed-off-by: Andres Gomez <agomez at igalia.com>
---
 src/mesa/drivers/dri/i965/brw_tcs.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_tcs.c b/src/mesa/drivers/dri/i965/brw_tcs.c
index d488715..2029ea5 100644
--- a/src/mesa/drivers/dri/i965/brw_tcs.c
+++ b/src/mesa/drivers/dri/i965/brw_tcs.c
@@ -395,8 +395,9 @@ brw_tcs_precompile(struct gl_context *ctx,
          _LinkedShaders[MESA_SHADER_TESS_CTRL]->TessCtrl.VerticesOut;
    }
 
-   key.tes_primitive_mode = brw->tess_eval_program ?
-      brw->tess_eval_program->PrimitiveMode : GL_TRIANGLES;
+   key.tes_primitive_mode = shader_prog->_LinkedShaders[MESA_SHADER_TESS_EVAL]
+      ? shader_prog->_LinkedShaders[MESA_SHADER_TESS_EVAL]->TessEval.PrimitiveMode
+      : GL_TRIANGLES;
 
    key.outputs_written = prog->OutputsWritten;
    key.patch_outputs_written = prog->PatchOutputsWritten;
-- 
2.8.1