Module: Mesa Branch: master Commit: cb56b31f84d833551997a5eb792ea271d84746f8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cb56b31f84d833551997a5eb792ea271d84746f8
Author: Jakob Bornecrantz <[email protected]> Date: Wed Apr 14 21:44:48 2010 +0100 swrastg: Fix defines to be able to load more then one sw driver --- src/gallium/targets/dri-swrast/swrast_drm_api.c | 12 ++++++------ 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 99c2554..63b935b 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; _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
