summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2014-07-28 19:45:09 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2014-08-25 23:35:47 +0100
commit0cdebea90cf0d1148a248503fc95694f23d528e2 (patch)
tree670e9e5c6a7dbd13fc8c370864bdd0cb29e1b1eb /src
parent6601260464cf0a95da784f8ac8cf29d95b2b253c (diff)
automake: gallium/freedreno: drop spurious include dirs
Rather than including two extra folders only for two headers, just prefix the headers and be done with it. Cc: "10.1 10.2" <mesa-stable@lists.freedesktop.org> Cc: Rob Clark <robclark@freedesktop.org> Cc: freedreno@lists.freedesktop.org Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Rob Clark <robdclark@gmail.com> (cherry picked from commit 458d03a4a4cebe7b9e9ea265d18bfc547bc4b49c) Conflicts: src/gallium/drivers/freedreno/Makefile.am
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/freedreno/Makefile.am2
-rw-r--r--src/gallium/drivers/freedreno/freedreno_screen.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am
index 7947dd1a56e..f110bad0c1f 100644
--- a/src/gallium/drivers/freedreno/Makefile.am
+++ b/src/gallium/drivers/freedreno/Makefile.am
@@ -5,8 +5,6 @@ include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
-Wno-packed-bitfield-compat \
- -I$(top_srcdir)/src/gallium/drivers/freedreno/a3xx \
- -I$(top_srcdir)/src/gallium/drivers/freedreno/a2xx \
$(GALLIUM_DRIVER_CFLAGS) \
$(FREEDRENO_CFLAGS)
diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c
index 332501ecd78..936b381a1f2 100644
--- a/src/gallium/drivers/freedreno/freedreno_screen.c
+++ b/src/gallium/drivers/freedreno/freedreno_screen.c
@@ -50,8 +50,8 @@
#include "freedreno_query.h"
#include "freedreno_util.h"
-#include "fd2_screen.h"
-#include "fd3_screen.h"
+#include "a2xx/fd2_screen.h"
+#include "a3xx/fd3_screen.h"
/* XXX this should go away */
#include "state_tracker/drm_driver.h"