diff options
| author | Emil Velikov <[email protected]> | 2015-10-26 11:53:36 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2015-10-30 17:37:08 +0000 |
| commit | 014f8ef2ff7885a2856f9558c693f8d45adb400d (patch) | |
| tree | a21b5ff4b6b0ee2c92d1db8e5d9932e0c3acbea6 /src/gallium/drivers | |
| parent | 2c705d2220fc2a737fe093897e7d4da5825fd5ab (diff) | |
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 <[email protected]>
Reviewed-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/virgl/Makefile.am | 5 | ||||
| -rw-r--r-- | src/gallium/drivers/virgl/virgl.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/virgl/virgl_resource.h | 2 |
3 files changed, 3 insertions, 6 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; |