diff options
| author | Alexander von Gluck IV <[email protected]> | 2013-10-04 15:26:03 +0000 |
|---|---|---|
| committer | Alexander von Gluck IV <[email protected]> | 2013-10-04 18:20:09 -0500 |
| commit | a4144af40003783093ac95d91340a55e40c82b26 (patch) | |
| tree | 05b7bcea363db4538dd74c15b9e5720e39733deb | |
| parent | 4d15ef512176cef548240bce031949e696f54847 (diff) | |
haiku: Clean up code, use target-helpers
* Thanks for the help xexaxo!
| -rw-r--r-- | src/gallium/targets/haiku-softpipe/GalliumContext.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/gallium/targets/haiku-softpipe/GalliumContext.cpp b/src/gallium/targets/haiku-softpipe/GalliumContext.cpp index 1c08fb1ab27..92ea67ab290 100644 --- 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); |