summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZack Rusin <[email protected]>2013-05-03 12:22:08 -0400
committerZack Rusin <[email protected]>2013-05-14 03:08:56 -0400
commit2866525b86db1aa90f1016161e75c7975364cc99 (patch)
treec6bc55bd1877e4856a2a59c028eddca3463c39b2
parentff256ec0686bad0ccf3c9df99ba442773efbc181 (diff)
draw/gs: don't bind the tgsi state if we're using llvm paths
Signed-off-by: Zack Rusin <[email protected]> Reviewed-by: José Fonseca <[email protected]> Reviewed-by: Roland Scheidegger <[email protected]>
-rw-r--r--src/gallium/auxiliary/draw/draw_gs.c7
1 files changed, 6 insertions, 1 deletions
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);