Mesa (master): target-helpers: If neither softpipe or llvmpipe is used just return the screen

[Jakob Bornecrantz]

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

Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Mon Jan  9 13:36:20 2012 +0100

target-helpers: If neither softpipe or llvmpipe is used just return the screen

So the targets can drop the sw_wrapper winsys when no sw driver is being used.

Signed-off-by: Jakob Bornecrantz <jakob at vmware.com>
Reviewed-by Brian Paul <brianp at vmware.com>

---

 .../target-helpers/inline_wrapper_sw_helper.h      |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/gallium/auxiliary/target-helpers/inline_wrapper_sw_helper.h b/src/gallium/auxiliary/target-helpers/inline_wrapper_sw_helper.h
index e4effa7..0a2e215 100644
--- a/src/gallium/auxiliary/target-helpers/inline_wrapper_sw_helper.h
+++ b/src/gallium/auxiliary/target-helpers/inline_wrapper_sw_helper.h
@@ -12,6 +12,7 @@
 static INLINE struct pipe_screen *
 sw_screen_wrap(struct pipe_screen *screen)
 {
+#if defined(GALLIUM_SOFTPIPE) || defined(GALLIUM_LLVMPIPE)
    struct sw_winsys *sws;
    struct pipe_screen *sw_screen = NULL;
    const char *driver;
@@ -34,6 +35,7 @@ sw_screen_wrap(struct pipe_screen *screen)
 err_winsys:
    return wrapper_sw_winsys_dewrap_pipe_screen(sws);
 err:
+#endif
    return screen;
 }