summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakob Bornecrantz <[email protected]>2010-04-14 21:44:48 +0100
committerJakob Bornecrantz <[email protected]>2010-04-14 23:10:17 +0100
commitcb56b31f84d833551997a5eb792ea271d84746f8 (patch)
tree2039ddd15ef0fbc4105e04905789b3f9714fb25f
parent8239fd4baa8ba6ce546960ad41a8c1c6088b3de3 (diff)
swrastg: Fix defines to be able to load more then one sw driver
-rw-r--r--src/gallium/targets/dri-swrast/swrast_drm_api.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/targets/dri-swrast/swrast_drm_api.c b/src/gallium/targets/dri-swrast/swrast_drm_api.c
index 99c25543a76..63b935bb07b 100644
--- a/src/gallium/targets/dri-swrast/swrast_drm_api.c
+++ b/src/gallium/targets/dri-swrast/swrast_drm_api.c
@@ -68,16 +68,16 @@ swrast_create_screen(struct sw_winsys *winsys)
#if defined(GALLIUM_CELL)
if (screen == NULL && strcmp(driver, "cell") == 0)
screen = cell_create_screen( winsys );
-#elif defined(GALLIUM_LLVMPIPE)
+#endif
+
+#if defined(GALLIUM_LLVMPIPE)
if (screen == NULL && strcmp(driver, "llvmpipe") == 0)
screen = llvmpipe_create_screen( winsys );
-#elif defined(GALLIUM_SOFTPIPE)
+#endif
+
+#if defined(GALLIUM_SOFTPIPE)
if (screen == NULL)
screen = softpipe_create_screen( winsys );
-
- (void) driver;
-#else
- (void) driver;
#endif
return screen;