softpipe: fix llvm build

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

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

diff --git a/src/gallium/drivers/softpipe/sp_context.c b/src/gallium/drivers/softpipe/sp_context.c
index abe0507b1acf148524164458533eee5583c1aaf5..1fb0a79f2074aa362dbd8cc156383d6e5dfd6b83 100644 (file)
--- 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 35521b64ab1221bbd6419866353cf64560ad9d2d..a9d70f94790d0b58e6c14e7bc3ee526236a891ff 100644 (file)
--- 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 2cac81641a0100f2fbf3f0d106e6585ce6eb5bd3..007feecb5de77bf9bcafe05bd396411b261b8822 100644 (file)
--- 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 *