Mesa (master): draw/gs: don't bind the tgsi state if we're using llvm paths

[Zack Rusin]

Module: Mesa
Branch: master
Commit: 2866525b86db1aa90f1016161e75c7975364cc99
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2866525b86db1aa90f1016161e75c7975364cc99

Author: Zack Rusin <zackr at vmware.com>
Date:   Fri May  3 12:22:08 2013 -0400

draw/gs: don't bind the tgsi state if we're using llvm paths

Signed-off-by: Zack Rusin <zackr at vmware.com>
Reviewed-by: José Fonseca <jfonseca at vmware.com>
Reviewed-by: Roland Scheidegger <sroland at vmware.com>

---

 src/gallium/auxiliary/draw/draw_gs.c |    7 ++++++-
 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 fcd6e2d..fa0981e 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);