From: Emil Velikov Date: Mon, 28 Jul 2014 18:45:09 +0000 (+0100) Subject: automake: gallium/freedreno: drop spurious include dirs X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=458d03a4a4cebe7b9e9ea265d18bfc547bc4b49c;p=mesa.git 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" Cc: Rob Clark Cc: freedreno@lists.freedesktop.org Signed-off-by: Emil Velikov Reviewed-by: Rob Clark --- diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am index 7d9c6e4933a..15a3e93c33e 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 \ -I$(top_srcdir)/src/gallium/drivers/freedreno/ir3 \ $(GALLIUM_DRIVER_CFLAGS) \ $(FREEDRENO_CFLAGS) diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c index 5fb73525e13..de69b14ce77 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"