From: Jakob Bornecrantz <jakob@vmware.com>
Date: Mon, 9 Jan 2012 12:36:20 +0000 (+0100)
Subject: target-helpers: If neither softpipe or llvmpipe is used just return the screen
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9af9e12bc57db3222d91992a69b7fd95231928f6;p=mesa.git

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@vmware.com>
Reviewed-by Brian Paul <brianp@vmware.com>
---

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 e4effa713e9..0a2e215352b 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;
 }