st/egl: cleanup sw winsys header inclusions

 - Drop duplicate include compiler directives.
 - Leave the sw/ prefix for all the software winsys headers.

Signed-off-by: Emil Velikov <[email protected]>

6 files changed, 8 insertions, 12 deletions

diff --git a/src/gallium/state_trackers/egl/Android.mk b/src/gallium/state_trackers/egl/Android.mk
index 7c4c93669c1..d1987624622 100644
--- a/src/gallium/state_trackers/egl/Android.mk
+++ b/src/gallium/state_trackers/egl/Android.mk
@@ -39,7 +39,7 @@ LOCAL_CFLAGS := \
 
 LOCAL_C_INCLUDES := \
 	$(GALLIUM_TOP)/state_trackers/egl \
-	$(GALLIUM_TOP)/winsys/sw \
+	$(GALLIUM_TOP)/winsys \
 	$(MESA_TOP)/src/egl/main
 
 # swrast only
diff --git a/src/gallium/state_trackers/egl/Makefile.am b/src/gallium/state_trackers/egl/Makefile.am
index 0ea218d37ce..3e917c1ac3c 100644
--- a/src/gallium/state_trackers/egl/Makefile.am
+++ b/src/gallium/state_trackers/egl/Makefile.am
@@ -31,7 +31,8 @@ AM_CFLAGS = \
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/egl/main \
-	-I$(top_builddir)/src/egl/wayland/wayland-drm/
+	-I$(top_builddir)/src/egl/wayland/wayland-drm/ \
+	-I$(top_srcdir)/src/gallium/winsys
 
 noinst_LTLIBRARIES = libegl.la
 libegl_la_SOURCES = $(common_FILES)
@@ -43,8 +44,6 @@ AM_CFLAGS += \
 	$(LIBDRM_CFLAGS) \
 	$(DRI2PROTO_CFLAGS)
 AM_CPPFLAGS += \
-	-I$(top_srcdir)/src/gallium/winsys \
-	-I$(top_srcdir)/src/gallium/drivers \
 	-I$(top_srcdir)/src/glx \
 	-I$(top_srcdir)/src/mapi \
 	-I$(top_srcdir)/src/mesa \
@@ -57,7 +56,6 @@ AM_CFLAGS += \
 	$(LIBDRM_CFLAGS) \
 	$(WAYLAND_CFLAGS)
 AM_CPPFLAGS += \
-	-I$(top_srcdir)/src/gallium/winsys \
 	-I$(top_srcdir)/src/egl/wayland/wayland-egl \
 	-I$(top_srcdir)/src/egl/wayland/wayland-drm \
 	-I$(top_builddir)/src/egl/wayland/wayland-drm \
@@ -70,7 +68,6 @@ AM_CFLAGS += \
 	$(LIBDRM_CFLAGS)
 AM_CPPFLAGS += \
 	-I$(top_srcdir)/src/loader \
-	-I$(top_srcdir)/src/gallium/winsys \
 	-I$(top_srcdir)/src/gbm/main \
 	-I$(top_srcdir)/src/gallium/state_trackers/gbm \
 	-DHAVE_DRM_BACKEND
@@ -79,14 +76,12 @@ endif
 if HAVE_EGL_PLATFORM_FBDEV
 libegl_la_SOURCES += $(fbdev_FILES)
 AM_CPPFLAGS += \
-	-I$(top_srcdir)/src/gallium/winsys/sw \
 	-DHAVE_FBDEV_BACKEND
 endif
 
 if HAVE_EGL_PLATFORM_NULL
 libegl_la_SOURCES += $(null_FILES)
 AM_CPPFLAGS += \
-	-I$(top_srcdir)/src/gallium/winsys/sw \
 	-DHAVE_NULL_BACKEND
 endif
 
diff --git a/src/gallium/state_trackers/egl/android/native_android.cpp b/src/gallium/state_trackers/egl/android/native_android.cpp
index 889b6442285..1e1ec877613 100644
--- a/src/gallium/state_trackers/egl/android/native_android.cpp
+++ b/src/gallium/state_trackers/egl/android/native_android.cpp
@@ -65,8 +65,8 @@ extern "C" {
 #include "util/u_box.h"
 #include "common/native.h"
 #include "common/native_helper.h"
-#include "android/android_sw_winsys.h"
 #include "state_tracker/drm_driver.h"
+#include "sw/android/android_sw_winsys.h"
 
 struct android_config;
 
diff --git a/src/gallium/state_trackers/egl/fbdev/native_fbdev.c b/src/gallium/state_trackers/egl/fbdev/native_fbdev.c
index b5c7b81a698..a6a254355ee 100644
--- a/src/gallium/state_trackers/egl/fbdev/native_fbdev.c
+++ b/src/gallium/state_trackers/egl/fbdev/native_fbdev.c
@@ -54,7 +54,7 @@
 
 #include "common/native.h"
 #include "common/native_helper.h"
-#include "fbdev/fbdev_sw_winsys.h"
+#include "sw/fbdev/fbdev_sw_winsys.h"
 
 struct fbdev_display {
    struct native_display base;
diff --git a/src/gallium/state_trackers/egl/gdi/native_gdi.c b/src/gallium/state_trackers/egl/gdi/native_gdi.c
index 9eb7c0f2b63..96d0ce41020 100644
--- a/src/gallium/state_trackers/egl/gdi/native_gdi.c
+++ b/src/gallium/state_trackers/egl/gdi/native_gdi.c
@@ -31,11 +31,12 @@
 #include "util/u_memory.h"
 #include "util/u_format.h"
 #include "util/u_inlines.h"
-#include "gdi/gdi_sw_winsys.h"
 
 #include "common/native_helper.h"
 #include "common/native.h"
 
+#include "sw/gdi/gdi_sw_winsys.h"
+
 struct gdi_display {
    struct native_display base;
 
diff --git a/src/gallium/state_trackers/egl/null/native_null.c b/src/gallium/state_trackers/egl/null/native_null.c
index aa95260f1c8..a5d6f1e0b3e 100644
--- a/src/gallium/state_trackers/egl/null/native_null.c
+++ b/src/gallium/state_trackers/egl/null/native_null.c
@@ -33,8 +33,8 @@
  */
 
 #include "util/u_memory.h"
-#include "null/null_sw_winsys.h"
 #include "common/native.h"
+#include "sw/null/null_sw_winsys.h"
 
 struct null_display {
    struct native_display base;