haiku: Clean up code, use target-helpers

* Thanks for the help xexaxo!

diff --git a/src/gallium/targets/haiku-softpipe/GalliumContext.cpp b/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
index 1c08fb1ab27395c68771622fcee663735a6b33b1..92ea67ab290ca220c22ae9e4e890f292fe21e03a 100644 (file)
--- a/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
+++ b/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
@@ -26,11 +26,9 @@ extern "C" {
 #include "state_tracker/st_manager.h"
 #include "state_tracker/sw_winsys.h"
 #include "hgl_sw_winsys.h"
-#ifdef HAVE_LLVM
-#include "llvmpipe/lp_public.h"
-#else
-#include "softpipe/sp_public.h"
-#endif
+
+#include "target-helpers/inline_sw_helper.h"
+#include "target-helpers/inline_debug_helper.h"
 }
 
 
@@ -200,11 +198,7 @@ GalliumContext::CreateScreen()
                return B_ERROR;
        }
 
-       #ifdef HAVE_LLVM
-       fScreen = llvmpipe_create_screen(winsys);
-       #else
-       fScreen = softpipe_create_screen(winsys);
-       #endif
+       fScreen = sw_screen_create(winsys);
 
        if (fScreen == NULL) {
                ERROR("%s: Couldn't create screen!\n", __FUNCTION__);
@@ -212,6 +206,8 @@ GalliumContext::CreateScreen()
                return B_ERROR;
        }
 
+       debug_screen_wrap(fScreen);
+
        const char* driverName = fScreen->get_name(fScreen);
        ERROR("%s: Using %s driver.\n", __func__, driverName);