Mesa (master): gallium/target-helpers: add OpenSWR driver

[Tim Rowley]

Module: Mesa
Branch: master
Commit: da4f95d168fa35234a1ed8e6b27a38fd8e8f7498
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=da4f95d168fa35234a1ed8e6b27a38fd8e8f7498

Author: Tim Rowley <timothy.o.rowley at intel.com>
Date:   Wed Feb 24 17:45:55 2016 -0600

gallium/target-helpers: add OpenSWR driver

Reviewed-by: Roland Scheidegger <sroland at vmware.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Acked-by: Jose Fonseca <jfonseca at vmware.com>

---

 src/gallium/auxiliary/target-helpers/inline_sw_helper.h | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/gallium/auxiliary/target-helpers/inline_sw_helper.h b/src/gallium/auxiliary/target-helpers/inline_sw_helper.h
index a9ab16f..5bb77a5 100644
--- a/src/gallium/auxiliary/target-helpers/inline_sw_helper.h
+++ b/src/gallium/auxiliary/target-helpers/inline_sw_helper.h
@@ -6,6 +6,9 @@
 #include "util/u_debug.h"
 #include "state_tracker/sw_winsys.h"
 
+#ifdef GALLIUM_SWR
+#include "swr/swr_public.h"
+#endif
 
 /* Helper function to choose and instantiate one of the software rasterizers:
  * llvmpipe, softpipe.
@@ -43,10 +46,15 @@ sw_screen_create_named(struct sw_winsys *winsys, const char *driver)
 #endif
 
 #if defined(GALLIUM_SOFTPIPE)
-   if (screen == NULL)
+   if (screen == NULL && strcmp(driver, "softpipe") == 0)
       screen = softpipe_create_screen(winsys);
 #endif
 
+#if defined(GALLIUM_SWR)
+   if (screen == NULL && strcmp(driver, "swr") == 0)
+      screen = swr_create_screen(winsys);
+#endif
+
    return screen;
 }
 
@@ -61,6 +69,8 @@ sw_screen_create(struct sw_winsys *winsys)
    default_driver = "llvmpipe";
 #elif defined(GALLIUM_SOFTPIPE)
    default_driver = "softpipe";
+#elif defined(GALLIUM_SWR)
+   default_driver = "swr";
 #else
    default_driver = "";
 #endif