From 2866525b86db1aa90f1016161e75c7975364cc99 Mon Sep 17 00:00:00 2001 From: Zack Rusin Date: Fri, 3 May 2013 12:22:08 -0400 Subject: draw/gs: don't bind the tgsi state if we're using llvm paths MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zack Rusin Reviewed-by: José Fonseca Reviewed-by: Roland Scheidegger --- src/gallium/auxiliary/draw/draw_gs.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gallium/auxiliary/draw/draw_gs.c b/src/gallium/auxiliary/draw/draw_gs.c index fcd6e2ddfdb..fa0981ee10e 100644 --- a/src/gallium/auxiliary/draw/draw_gs.c +++ b/src/gallium/auxiliary/draw/draw_gs.c @@ -661,7 +661,12 @@ int draw_geometry_shader_run(struct draw_geometry_shader *shader, void draw_geometry_shader_prepare(struct draw_geometry_shader *shader, struct draw_context *draw) { - if (shader && shader->machine->Tokens != shader->state.tokens) { +#ifdef HAVE_LLVM + boolean use_llvm = draw_get_option_use_llvm(); +#else + boolean use_llvm = FALSE; +#endif + if (!use_llvm && shader && shader->machine->Tokens != shader->state.tokens) { tgsi_exec_machine_bind_shader(shader->machine, shader->state.tokens, draw->gs.tgsi.sampler); -- cgit v1.2.3