Mesa (master): softpipe: fix llvm build

[Dave Airlie]

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

Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Jan 11 10:16:56 2012 +0000

softpipe: fix llvm build

Thanks to Wubbbi on #dri-devel for pointing it out.

Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/gallium/drivers/softpipe/sp_context.c |    2 +-
 src/gallium/drivers/softpipe/sp_screen.c  |    2 +-
 src/gallium/drivers/softpipe/sp_screen.h  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/softpipe/sp_context.c b/src/gallium/drivers/softpipe/sp_context.c
index abe0507..1fb0a79 100644
--- a/src/gallium/drivers/softpipe/sp_context.c
+++ b/src/gallium/drivers/softpipe/sp_context.c
@@ -305,7 +305,7 @@ softpipe_create_context( struct pipe_screen *screen,
    /*
     * Create drawing context and plug our rendering stage into it.
     */
-   if (sp_screen->using_llvm)
+   if (sp_screen->use_llvm)
       softpipe->draw = draw_create(&softpipe->pipe);
    else
       softpipe->draw = draw_create_no_llvm(&softpipe->pipe);
diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
index 35521b6..a9d70f9 100644
--- a/src/gallium/drivers/softpipe/sp_screen.c
+++ b/src/gallium/drivers/softpipe/sp_screen.c
@@ -334,7 +334,7 @@ softpipe_create_screen(struct sw_winsys *winsys)
    screen->base.context_create = softpipe_create_context;
    screen->base.flush_frontbuffer = softpipe_flush_frontbuffer;
 
-   screen->using_llvm = debug_get_option_use_llvm();
+   screen->use_llvm = debug_get_option_use_llvm();
 
    util_format_s3tc_init();
 
diff --git a/src/gallium/drivers/softpipe/sp_screen.h b/src/gallium/drivers/softpipe/sp_screen.h
index 2cac816..007feec 100644
--- a/src/gallium/drivers/softpipe/sp_screen.h
+++ b/src/gallium/drivers/softpipe/sp_screen.h
@@ -46,7 +46,7 @@ struct softpipe_screen {
     * this.
     */
    unsigned timestamp;
-   boolean using_llvm;
+   boolean use_llvm;
 };
 
 static INLINE struct softpipe_screen *