virgl: straighten the includes confusion

Use the relevant GALLIUM_foo_CFLAGS which has all the requirements
(not to mention VISIBITY_CFLAGS) and keep ../ out of the include
directives.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/gallium/drivers/virgl/Makefile.am b/src/gallium/drivers/virgl/Makefile.am
index c22cdb7379fa9f716482e4a3e832ecd75b03ebd4..82d9756143f873cb220903d86b46e327a97893b0 100644 (file)
--- a/src/gallium/drivers/virgl/Makefile.am
+++ b/src/gallium/drivers/virgl/Makefile.am
@@ -24,10 +24,7 @@ include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/src/gallium/drivers \
-       -I$(top_srcdir)/src/gallium/winsys/virgl/drm \
-       -I$(top_srcdir)/include \
-       $(GALLIUM_CFLAGS) \
+       $(GALLIUM_DRIVER_CFLAGS) \
        $(LIBDRM_CFLAGS)
 
 noinst_LTLIBRARIES = libvirgl.la

diff --git a/src/gallium/drivers/virgl/virgl.h b/src/gallium/drivers/virgl/virgl.h
index 21e3bc0ea36d5be5fe81371c5f5cf00efa99b382..ecd997b546fa4404c2491804f86bff6502aa95ff 100644 (file)
--- a/src/gallium/drivers/virgl/virgl.h
+++ b/src/gallium/drivers/virgl/virgl.h
@@ -25,7 +25,7 @@
 
 #include "util/u_transfer.h"
 
-#include "../winsys/virgl/drm/virgl_hw.h"
+#include "virgl/drm/virgl_hw.h"
 
 #include "virgl_winsys.h"
 #include "pipe/p_screen.h"

diff --git a/src/gallium/drivers/virgl/virgl_resource.h b/src/gallium/drivers/virgl/virgl_resource.h
index 2d0bd8b64008c58966a50846b82aec61592e2cd3..b80545e4760ce59ae145279b02062f1e7f4484c6 100644 (file)
--- a/src/gallium/drivers/virgl/virgl_resource.h
+++ b/src/gallium/drivers/virgl/virgl_resource.h
@@ -29,7 +29,7 @@
 #include "util/list.h"
 #include "util/u_transfer.h"
 
-#include "virgl_hw.h"
+#include "virgl/drm/virgl_hw.h"
 #define VR_MAX_TEXTURE_2D_LEVELS 15
 
 struct virgl_screen;

diff --git a/src/gallium/winsys/virgl/drm/Makefile.am b/src/gallium/winsys/virgl/drm/Makefile.am
index 49680e065bee9cab9ee54ba434acd2393b8c66cc..9c1db31c7ef977b2d1296492451b5ff1665db912 100644 (file)
--- a/src/gallium/winsys/virgl/drm/Makefile.am
+++ b/src/gallium/winsys/virgl/drm/Makefile.am
@@ -24,9 +24,9 @@ include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-       -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/gallium/drivers \
-       $(GALLIUM_CFLAGS) \
+       -I$(top_srcdir)/src/gallium/winsys \
+       $(GALLIUM_WINSYS_CFLAGS) \
        $(LIBDRM_CFLAGS)
 
 noinst_LTLIBRARIES = libvirgldrm.la

diff --git a/src/gallium/winsys/virgl/vtest/Makefile.am b/src/gallium/winsys/virgl/vtest/Makefile.am
index 81270d7b74b276bc9d30b3378c3b930dcd800938..827b353930fa088cfcd4ac2dd7063c4648f79ced 100644 (file)
--- a/src/gallium/winsys/virgl/vtest/Makefile.am
+++ b/src/gallium/winsys/virgl/vtest/Makefile.am
@@ -24,9 +24,9 @@ include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-       -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/gallium/drivers \
-       $(GALLIUM_CFLAGS)
+       -I$(top_srcdir)/src/gallium/winsys \
+       $(GALLIUM_WINSYS_CFLAGS)
 
 noinst_LTLIBRARIES = libvirglvtest.la
 

diff --git a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h
index 3967befa1a9db6ef0e7061de236c3cc837f05e8b..2f9dc8407eabd77b0f63ee7ac6d3532145ca5f8e 100644 (file)
--- a/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h
+++ b/src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h
@@ -28,7 +28,7 @@
 #include "pipe/p_defines.h"
 #include "pipe/p_state.h"
 #include "state_tracker/sw_winsys.h"
-#include "../drm/virgl_hw.h"
+#include "virgl/drm/virgl_hw.h"
 #include "virgl/virgl_winsys.h"
 #include "util/list.h"
 #include "os/os_thread.h"