From 014f8ef2ff7885a2856f9558c693f8d45adb400d Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 26 Oct 2015 11:53:36 +0000 Subject: [PATCH] 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 Reviewed-by: Dave Airlie --- src/gallium/drivers/virgl/Makefile.am | 5 +---- src/gallium/drivers/virgl/virgl.h | 2 +- src/gallium/drivers/virgl/virgl_resource.h | 2 +- src/gallium/winsys/virgl/drm/Makefile.am | 4 ++-- src/gallium/winsys/virgl/vtest/Makefile.am | 4 ++-- src/gallium/winsys/virgl/vtest/virgl_vtest_winsys.h | 2 +- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/gallium/drivers/virgl/Makefile.am b/src/gallium/drivers/virgl/Makefile.am index c22cdb7379f..82d9756143f 100644 --- 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 21e3bc0ea36..ecd997b546f 100644 --- 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 2d0bd8b6400..b80545e4760 100644 --- 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 49680e065be..9c1db31c7ef 100644 --- 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 81270d7b74b..827b353930f 100644 --- 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 3967befa1a9..2f9dc8407ea 100644 --- 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" -- 2.30.2