summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJakob Bornecrantz <jakob@vmware.com>2012-01-09 13:36:20 +0100
committerJakob Bornecrantz <jakob@vmware.com>2012-01-10 15:53:18 +0100
commit9af9e12bc57db3222d91992a69b7fd95231928f6 (patch)
tree2aa67f5d8e246db089016e96d47a3c58ac795c8e /src
parentec8cbd79ac4065111365a6720c9564de56855cc8 (diff)
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>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/auxiliary/target-helpers/inline_wrapper_sw_helper.h2
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 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;
}