targets/haiku-softpipe: explicitly prefix sw/hgl header

Cc: Alexander von Gluck IV <kallisti5@unixzen.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

diff --git a/src/gallium/targets/haiku-softpipe/GalliumContext.cpp b/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
index c740458bc7253ed371c8d9c6fce688788e094fed..d7d5d9d731c7ce824a3ca19236b532aabbfc10dd 100644 (file)
--- a/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
+++ b/src/gallium/targets/haiku-softpipe/GalliumContext.cpp
@@ -26,8 +26,8 @@ extern "C" {
 #include "state_tracker/st_gl_api.h"
 #include "state_tracker/st_manager.h"
 #include "state_tracker/sw_winsys.h"
+#include "sw/hgl/hgl_sw_winsys.h"
 #include "util/u_memory.h"
-#include "hgl_sw_winsys.h"
 
 #include "target-helpers/inline_sw_helper.h"
 #include "target-helpers/inline_debug_helper.h"

diff --git a/src/gallium/targets/haiku-softpipe/SConscript b/src/gallium/targets/haiku-softpipe/SConscript
index d5fd6994b2500c45573daa88fedfb266e35a4231..210721c420fd6a1a19aca4be67c472a6de12e96f 100644 (file)
--- a/src/gallium/targets/haiku-softpipe/SConscript
+++ b/src/gallium/targets/haiku-softpipe/SConscript
@@ -26,7 +26,7 @@ env.Append(CPPPATH = [
     '#/src/mesa',
     '#/src/mesa/main',
     '#/include/HaikuGL',
-    '#/src/gallium/winsys/sw/hgl',
+    '#/src/gallium/winsys',
     '#/src/gallium/state_trackers/hgl',
     '/boot/system/develop/headers/private',
 ])