2 files changed, 4 insertions, 42 deletions
diff --git a/src/gallium/targets/graw-gdi/graw_gdi.c b/src/gallium/targets/graw-gdi/graw_gdi.c
index 52a4e3cb231..bd6242b0779 100644
--- a/src/gallium/targets/graw-gdi/graw_gdi.c
+++ b/src/gallium/targets/graw-gdi/graw_gdi.c
@@ -28,10 +28,9 @@
 
 #include "gdi/gdi_sw_winsys.h"
 #include "pipe/p_screen.h"
-#include "softpipe/sp_public.h"
 #include "state_tracker/graw.h"
-#include "sw/sw_public.h"
 #include "target-helpers/wrap_screen.h"
+#include "target-helpers/inline_sw_helper.h"
 #include <windows.h>
 
 
@@ -80,7 +79,7 @@ graw_create_window_and_screen(int x,
    if (winsys == NULL)
       goto fail;
 
-   screen = softpipe_create_screen(winsys);
+   screen = sw_screen_create(winsys);
    if (screen == NULL)
       goto fail;
 
diff --git a/src/gallium/targets/graw-xlib/graw_xlib.c b/src/gallium/targets/graw-xlib/graw_xlib.c
index 8b64a0b819c..8658e19e3a3 100644
--- a/src/gallium/targets/graw-xlib/graw_xlib.c
+++ b/src/gallium/targets/graw-xlib/graw_xlib.c
@@ -4,22 +4,8 @@
 #include "util/u_debug.h"
 #include "util/u_memory.h"
 #include "target-helpers/wrap_screen.h"
+#include "target-helpers/inline_sw_helper.h"
 #include "state_tracker/xlib_sw_winsys.h"
-
-#ifdef GALLIUM_SOFTPIPE
-#include "softpipe/sp_public.h"
-#endif
-
-#ifdef GALLIUM_LLVMPIPE
-#include "llvmpipe/lp_public.h"
-#endif
-
-/* Haven't figured out a decent way to build the helper code yet -
- * #include it here temporarily.
- */
-#include "sw/sw_public.h"
-#include "sw/sw.c"
-
 #include "state_tracker/graw.h"
 
 #include <X11/Xlib.h>
@@ -36,8 +22,6 @@ static struct {
 static struct pipe_screen *
 graw_create_screen( void )
 {
-   const char *default_driver;
-   const char *driver;
    struct pipe_screen *screen = NULL;
    struct sw_winsys *winsys = NULL;
 
@@ -48,25 +32,7 @@ graw_create_screen( void )
    if (winsys == NULL)
       return NULL;
 
-#if defined(GALLIUM_LLVMPIPE)
-   default_driver = "llvmpipe";
-#elif defined(GALLIUM_SOFTPIPE)
-   default_driver = "softpipe";
-#else
-   default_driver = "";
-#endif
-
-   driver = debug_get_option("GALLIUM_DRIVER", default_driver);
-
-#if defined(GALLIUM_LLVMPIPE)
-   if (screen == NULL && strcmp(driver, "llvmpipe") == 0)
-      screen = llvmpipe_create_screen( winsys );
-#endif
-
-#if defined(GALLIUM_SOFTPIPE)
-   if (screen == NULL)
-      screen = softpipe_create_screen( winsys );
-#endif
+   screen = sw_screen_create( winsys );
 
    /* Inject any wrapping layers we want to here:
     */
@@ -74,9 +40,6 @@ graw_create_screen( void )
 }
 
 
- 
-
-
 struct pipe_screen *
 graw_create_window_and_screen( int x,
                                int y,