diff options
| author | Nicolai Hähnle <[email protected]> | 2017-06-30 11:57:06 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <[email protected]> | 2017-07-31 15:38:41 +0200 |
| commit | 601093f95ddf6b49a79baa91dc51d4f163dfc8de (patch) | |
| tree | 79cc7388e4d4de45d226852368ffcc813098b577 /src/mesa/drivers/dri/i915 | |
| parent | 1e40d2c8820e2045fbfed387a93a486c8b1c94fd (diff) | |
xmlconfig: move into src/util
v2: attempt to fix Android build (Emil)
v3: add missing include path
Reviewed-by: Marek Olšák <[email protected]> (v1)
Diffstat (limited to 'src/mesa/drivers/dri/i915')
| -rw-r--r-- | src/mesa/drivers/dri/i915/Makefile.am | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_screen.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_screen.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am index feead3eb2d2..70ca0490a35 100644 --- a/src/mesa/drivers/dri/i915/Makefile.am +++ b/src/mesa/drivers/dri/i915/Makefile.am @@ -30,7 +30,7 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/mesa/ \ -I$(top_srcdir)/src/gallium/include \ -I$(top_srcdir)/src/gallium/auxiliary \ - -I$(top_builddir)/src/mesa/drivers/dri/common \ + -I$(top_builddir)/src/util \ -I$(top_srcdir)/src/mesa/drivers/dri/common \ $(DEFINES) \ $(VISIBILITY_CFLAGS) \ diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c index 863f6ef7ec1..367a7347fb9 100644 --- a/src/mesa/drivers/dri/i915/intel_screen.c +++ b/src/mesa/drivers/dri/i915/intel_screen.c @@ -39,7 +39,7 @@ #include "swrast/s_renderbuffer.h" #include "utils.h" -#include "xmlpool.h" +#include "util/xmlpool.h" static const __DRIconfigOptionsExtension i915_config_options = { .base = { __DRI_CONFIG_OPTIONS, 1 }, diff --git a/src/mesa/drivers/dri/i915/intel_screen.h b/src/mesa/drivers/dri/i915/intel_screen.h index 11e1a3fa31d..a22888b391a 100644 --- a/src/mesa/drivers/dri/i915/intel_screen.h +++ b/src/mesa/drivers/dri/i915/intel_screen.h @@ -33,7 +33,7 @@ #include "dri_util.h" #include "intel_bufmgr.h" #include "i915_drm.h" -#include "xmlconfig.h" +#include "util/xmlconfig.h" struct intel_screen { |