summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/egl/Android.mk2
-rw-r--r--src/egl/Makefile.am1
-rw-r--r--src/egl/SConscript1
-rw-r--r--src/egl/drivers/dri2/egl_dri2.c2
-rw-r--r--src/egl/drivers/dri2/platform_wayland.c2
-rw-r--r--src/egl/meson.build2
-rw-r--r--src/freedreno/drm/msm_drm.h2
-rw-r--r--src/gallium/drivers/etnaviv/etnaviv_resource.c2
-rw-r--r--src/gallium/drivers/etnaviv/etnaviv_screen.c2
-rw-r--r--src/gallium/drivers/etnaviv/etnaviv_texture.c2
-rw-r--r--src/gallium/drivers/etnaviv/etnaviv_texture_state.c2
-rw-r--r--src/gallium/drivers/etnaviv/etnaviv_transfer.c2
-rw-r--r--src/gallium/drivers/freedreno/Android.mk2
-rw-r--r--src/gallium/drivers/freedreno/Makefile.am2
-rw-r--r--src/gallium/drivers/freedreno/freedreno_resource.c2
-rw-r--r--src/gallium/drivers/freedreno/freedreno_screen.c2
-rw-r--r--src/gallium/drivers/nouveau/Android.mk2
-rw-r--r--src/gallium/drivers/nouveau/Makefile.am2
-rw-r--r--src/gallium/drivers/nouveau/meson.build2
-rw-r--r--src/gallium/drivers/nouveau/nouveau_winsys.h2
-rw-r--r--src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c2
-rw-r--r--src/gallium/drivers/nouveau/nvc0/nvc0_resource.c2
-rw-r--r--src/gallium/drivers/panfrost/meson.build1
-rw-r--r--src/gallium/drivers/panfrost/pan_resource.c2
-rw-r--r--src/gallium/drivers/panfrost/pan_resource.h2
-rw-r--r--src/gallium/drivers/panfrost/pan_screen.c2
-rw-r--r--src/gallium/drivers/tegra/Makefile.am2
-rw-r--r--src/gallium/drivers/tegra/meson.build2
-rw-r--r--src/gallium/drivers/tegra/tegra_screen.c4
-rw-r--r--src/gallium/drivers/v3d/Makefile.am2
-rw-r--r--src/gallium/drivers/v3d/meson.build4
-rw-r--r--src/gallium/drivers/v3d/v3d_context.h2
-rw-r--r--src/gallium/drivers/v3d/v3d_resource.c2
-rw-r--r--src/gallium/drivers/vc4/Android.mk2
-rw-r--r--src/gallium/drivers/vc4/Makefile.am2
-rw-r--r--src/gallium/drivers/vc4/meson.build2
-rw-r--r--src/gallium/drivers/vc4/vc4_context.h2
-rw-r--r--src/gallium/drivers/vc4/vc4_resource.c4
-rw-r--r--src/gallium/drivers/vc4/vc4_screen.c4
-rw-r--r--src/gallium/state_trackers/dri/dri2.c2
-rw-r--r--src/gallium/state_trackers/va/surface.c2
-rw-r--r--src/gallium/targets/d3dadapter9/drm.c2
-rw-r--r--src/gallium/winsys/i915/drm/i915_drm_batchbuffer.c2
-rw-r--r--src/gallium/winsys/i915/drm/i915_drm_buffer.c2
-rw-r--r--src/gallium/winsys/i915/drm/i915_drm_winsys.c2
-rw-r--r--src/gallium/winsys/i915/drm/i915_drm_winsys.h2
-rw-r--r--src/gallium/winsys/svga/drm/vmwgfx_drm.h2
-rw-r--r--src/gallium/winsys/virgl/drm/virtgpu_drm.h2
-rw-r--r--src/gbm/backends/dri/gbm_dri.c2
-rw-r--r--src/intel/Android.dev.mk2
-rw-r--r--src/intel/Android.vulkan.mk1
-rw-r--r--src/intel/Makefile.am1
-rw-r--r--src/intel/Makefile.vulkan.am2
-rw-r--r--src/intel/common/gen_defines.h2
-rw-r--r--src/intel/dev/gen_device_info.c2
-rw-r--r--src/intel/dev/meson.build2
-rw-r--r--src/intel/isl/isl_drm.c4
-rw-r--r--src/intel/isl/meson.build6
-rw-r--r--src/intel/tools/aub_write.c2
-rw-r--r--src/intel/tools/error2aub.c2
-rw-r--r--src/intel/tools/intel_dump_gpu.c2
-rw-r--r--src/intel/tools/intel_sanitize_gpu.c2
-rw-r--r--src/intel/tools/meson.build6
-rw-r--r--src/intel/vulkan/anv_device.c2
-rw-r--r--src/intel/vulkan/anv_formats.c2
-rw-r--r--src/intel/vulkan/anv_image.c2
-rw-r--r--src/intel/vulkan/anv_private.h2
-rw-r--r--src/intel/vulkan/meson.build8
-rw-r--r--src/loader/Makefile.am1
-rw-r--r--src/loader/loader_dri3_helper.c2
-rw-r--r--src/loader/meson.build2
-rw-r--r--src/mesa/drivers/dri/i915/intel_buffers.h2
-rw-r--r--src/mesa/drivers/dri/i915/intel_context.h4
-rw-r--r--src/mesa/drivers/dri/i915/intel_screen.c2
-rw-r--r--src/mesa/drivers/dri/i915/intel_screen.h2
-rw-r--r--src/mesa/drivers/dri/i965/Android.mk4
-rw-r--r--src/mesa/drivers/dri/i965/Makefile.am2
-rw-r--r--src/mesa/drivers/dri/i965/brw_bufmgr.c2
-rw-r--r--src/mesa/drivers/dri/i965/brw_performance_query.c2
-rw-r--r--src/mesa/drivers/dri/i965/intel_batchbuffer.c2
-rw-r--r--src/mesa/drivers/dri/i965/intel_buffers.h2
-rw-r--r--src/mesa/drivers/dri/i965/intel_mipmap_tree.c2
-rw-r--r--src/mesa/drivers/dri/i965/intel_screen.c4
-rw-r--r--src/mesa/drivers/dri/i965/intel_screen.h2
-rw-r--r--src/mesa/drivers/dri/i965/meson.build2
-rw-r--r--src/mesa/drivers/dri/r200/r200_context.h2
-rw-r--r--src/mesa/drivers/dri/r200/r200_ioctl.h2
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_context.h2
-rw-r--r--src/vulkan/Makefile.am1
-rw-r--r--src/vulkan/wsi/meson.build2
-rw-r--r--src/vulkan/wsi/wsi_common.c2
-rw-r--r--src/vulkan/wsi/wsi_common_display.c2
-rw-r--r--src/vulkan/wsi/wsi_common_wayland.c2
-rw-r--r--src/vulkan/wsi/wsi_common_x11.c2
94 files changed, 103 insertions, 108 deletions
diff --git a/src/egl/Android.mk b/src/egl/Android.mk
index 42b391e6d86..e78dd48f3ec 100644
--- a/src/egl/Android.mk
+++ b/src/egl/Android.mk
@@ -43,7 +43,7 @@ LOCAL_CFLAGS := \
-DHAVE_ANDROID_PLATFORM
LOCAL_C_INCLUDES := \
- $(MESA_TOP)/include/drm-uapi \
+ $(MESA_TOP)/include \
$(MESA_TOP)/src/egl/main \
$(MESA_TOP)/src/egl/drivers/dri2
diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index de4a754a2db..4383cca1e00 100644
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -27,7 +27,6 @@ BUILT_SOURCES =
AM_CFLAGS = \
-I$(top_srcdir)/include \
- -I$(top_srcdir)/include/drm-uapi \
-I$(top_srcdir)/src/mapi \
-I$(top_srcdir)/src/egl/main \
-I$(top_srcdir)/src/gbm/main \
diff --git a/src/egl/SConscript b/src/egl/SConscript
index 153fdc08923..927092d2284 100644
--- a/src/egl/SConscript
+++ b/src/egl/SConscript
@@ -8,7 +8,6 @@ env = env.Clone()
env.Append(CPPPATH = [
'#/include',
- '#/include/drm-uapi',
'#/include/HaikuGL',
'#/src/egl/main',
'#/src',
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 17bee797b4a..0f417e571bb 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -40,7 +40,7 @@
#include <time.h>
#ifdef HAVE_LIBDRM
#include <xf86drm.h>
-#include <drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"
#endif
#include <GL/gl.h>
#include <GL/internal/dri_interface.h>
diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
index c3ca1b6f7bc..8be4db7f258 100644
--- a/src/egl/drivers/dri2/platform_wayland.c
+++ b/src/egl/drivers/dri2/platform_wayland.c
@@ -36,7 +36,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <xf86drm.h>
-#include <drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"
#include <sys/mman.h>
#include "egl_dri2.h"
diff --git a/src/egl/meson.build b/src/egl/meson.build
index a23cc36fc2b..f4293f1f4f7 100644
--- a/src/egl/meson.build
+++ b/src/egl/meson.build
@@ -24,7 +24,7 @@ inc_egl_dri2 = include_directories('drivers/dri2')
c_args_for_egl = []
link_for_egl = []
deps_for_egl = []
-incs_for_egl = [inc_include, inc_drm_uapi, inc_src, inc_egl]
+incs_for_egl = [inc_include, inc_src, inc_egl]
files_egl = files(
'main/eglapi.c',
diff --git a/src/freedreno/drm/msm_drm.h b/src/freedreno/drm/msm_drm.h
index 91a16b333c6..6623a61093a 100644
--- a/src/freedreno/drm/msm_drm.h
+++ b/src/freedreno/drm/msm_drm.h
@@ -25,7 +25,7 @@
#ifndef __MSM_DRM_H__
#define __MSM_DRM_H__
-#include "drm.h"
+#include "drm-uapi/drm.h"
#if defined(__cplusplus)
extern "C" {
diff --git a/src/gallium/drivers/etnaviv/etnaviv_resource.c b/src/gallium/drivers/etnaviv/etnaviv_resource.c
index 9a7ebf3064e..418effa92d7 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_resource.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_resource.c
@@ -36,7 +36,7 @@
#include "util/u_inlines.h"
#include "util/u_memory.h"
-#include <drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"
#ifndef DRM_FORMAT_MOD_INVALID
#define DRM_FORMAT_MOD_INVALID ((1ULL<<56) - 1)
diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c b/src/gallium/drivers/etnaviv/etnaviv_screen.c
index 35dcac1409b..de822fc85ca 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_screen.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c
@@ -46,7 +46,7 @@
#include "state_tracker/drm_driver.h"
-#include <drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"
#define ETNA_DRM_VERSION(major, minor) ((major) << 16 | (minor))
#define ETNA_DRM_VERSION_FENCE_FD ETNA_DRM_VERSION(1, 1)
diff --git a/src/gallium/drivers/etnaviv/etnaviv_texture.c b/src/gallium/drivers/etnaviv/etnaviv_texture.c
index b06f20531fd..c4d53324054 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_texture.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_texture.c
@@ -37,7 +37,7 @@
#include "util/u_inlines.h"
#include "util/u_memory.h"
-#include <drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"
static void
etna_bind_sampler_states(struct pipe_context *pctx, enum pipe_shader_type shader,
diff --git a/src/gallium/drivers/etnaviv/etnaviv_texture_state.c b/src/gallium/drivers/etnaviv/etnaviv_texture_state.c
index ef2a7bd581c..3b55313074c 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_texture_state.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_texture_state.c
@@ -37,7 +37,7 @@
#include "util/u_inlines.h"
#include "util/u_memory.h"
-#include <drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"
static void *
etna_create_sampler_state_state(struct pipe_context *pipe,
diff --git a/src/gallium/drivers/etnaviv/etnaviv_transfer.c b/src/gallium/drivers/etnaviv/etnaviv_transfer.c
index 0294697af28..0b7411b47ef 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_transfer.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_transfer.c
@@ -42,7 +42,7 @@
#include "hw/common_3d.xml.h"
-#include <drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"
/* Compute offset into a 1D/2D/3D buffer of a certain box.
* This box must be aligned to the block width and height of the
diff --git a/src/gallium/drivers/freedreno/Android.mk b/src/gallium/drivers/freedreno/Android.mk
index e579264924f..ccd88a7d16c 100644
--- a/src/gallium/drivers/freedreno/Android.mk
+++ b/src/gallium/drivers/freedreno/Android.mk
@@ -39,7 +39,7 @@ LOCAL_SRC_FILES := \
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/ir3 \
- $(MESA_TOP)/include/drm-uapi
+ $(MESA_TOP)/include
LOCAL_GENERATED_SOURCES := $(MESA_GEN_NIR_H)
diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am
index dbc15f40389..c002378dfb1 100644
--- a/src/gallium/drivers/freedreno/Makefile.am
+++ b/src/gallium/drivers/freedreno/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
-Wno-packed-bitfield-compat \
- -I$(top_srcdir)/include/drm-uapi \
+ -I$(top_srcdir)/include \
-I$(top_srcdir)/src/gallium/drivers/freedreno/ir3 \
-I$(top_srcdir)/src/freedreno \
-I$(top_srcdir)/src/freedreno/registers \
diff --git a/src/gallium/drivers/freedreno/freedreno_resource.c b/src/gallium/drivers/freedreno/freedreno_resource.c
index 5f99a7ca60c..f2ad2c517c6 100644
--- a/src/gallium/drivers/freedreno/freedreno_resource.c
+++ b/src/gallium/drivers/freedreno/freedreno_resource.c
@@ -43,7 +43,7 @@
#include "freedreno_query_hw.h"
#include "freedreno_util.h"
-#include <drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"
#include <errno.h>
/* XXX this should go away, needed for 'struct winsys_handle' */
diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c
index c3b08ab0e0f..c5a96a87dc0 100644
--- a/src/gallium/drivers/freedreno/freedreno_screen.c
+++ b/src/gallium/drivers/freedreno/freedreno_screen.c
@@ -39,7 +39,7 @@
#include "util/os_time.h"
-#include <drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/gallium/drivers/nouveau/Android.mk b/src/gallium/drivers/nouveau/Android.mk
index a446774a86e..cd2dd0938f4 100644
--- a/src/gallium/drivers/nouveau/Android.mk
+++ b/src/gallium/drivers/nouveau/Android.mk
@@ -37,7 +37,7 @@ LOCAL_SRC_FILES := \
$(NVC0_C_SOURCES)
LOCAL_C_INCLUDES := \
- $(MESA_TOP)/include/drm-uapi
+ $(MESA_TOP)/include
LOCAL_SHARED_LIBRARIES := libdrm_nouveau
LOCAL_MODULE := libmesa_pipe_nouveau
diff --git a/src/gallium/drivers/nouveau/Makefile.am b/src/gallium/drivers/nouveau/Makefile.am
index f6126b54481..48c0fdf512d 100644
--- a/src/gallium/drivers/nouveau/Makefile.am
+++ b/src/gallium/drivers/nouveau/Makefile.am
@@ -24,7 +24,7 @@ include Makefile.sources
include $(top_srcdir)/src/gallium/Automake.inc
AM_CPPFLAGS = \
- -I$(top_srcdir)/include/drm-uapi \
+ -I$(top_srcdir)/include \
$(GALLIUM_DRIVER_CFLAGS) \
$(LIBDRM_CFLAGS) \
$(NOUVEAU_CFLAGS)
diff --git a/src/gallium/drivers/nouveau/meson.build b/src/gallium/drivers/nouveau/meson.build
index 242ee0e0001..4192967f82d 100644
--- a/src/gallium/drivers/nouveau/meson.build
+++ b/src/gallium/drivers/nouveau/meson.build
@@ -208,7 +208,7 @@ libnouveau = static_library(
'nouveau',
[files_libnouveau],
include_directories : [
- inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_drm_uapi
+ inc_src, inc_include, inc_gallium, inc_gallium_aux,
],
c_args : [c_vis_args],
cpp_args : [cpp_vis_args],
diff --git a/src/gallium/drivers/nouveau/nouveau_winsys.h b/src/gallium/drivers/nouveau/nouveau_winsys.h
index f13988ea526..e0ed0af3eaa 100644
--- a/src/gallium/drivers/nouveau/nouveau_winsys.h
+++ b/src/gallium/drivers/nouveau/nouveau_winsys.h
@@ -6,7 +6,7 @@
#include "pipe/p_defines.h"
-#include <drm.h>
+#include "drm-uapi/drm.h"
#include <nouveau.h>
#ifndef NV04_PFIFO_MAX_PACKET_LEN
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c b/src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c
index 7983c403087..af5baa3def0 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c
@@ -20,7 +20,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"
#include "pipe/p_state.h"
#include "pipe/p_defines.h"
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_resource.c b/src/gallium/drivers/nouveau/nvc0/nvc0_resource.c
index ec6257a8963..d73ecf71624 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_resource.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_resource.c
@@ -1,4 +1,4 @@
-#include <drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"
#include "pipe/p_context.h"
#include "nvc0/nvc0_resource.h"
diff --git a/src/gallium/drivers/panfrost/meson.build b/src/gallium/drivers/panfrost/meson.build
index 5e799eae119..17fdb5e1e0d 100644
--- a/src/gallium/drivers/panfrost/meson.build
+++ b/src/gallium/drivers/panfrost/meson.build
@@ -46,7 +46,6 @@ inc_panfrost = [
inc_common,
inc_gallium,
inc_gallium_aux,
- inc_drm_uapi,
inc_include,
inc_src,
include_directories('include'),
diff --git a/src/gallium/drivers/panfrost/pan_resource.c b/src/gallium/drivers/panfrost/pan_resource.c
index 4864ffb4fd3..a38ab5e9928 100644
--- a/src/gallium/drivers/panfrost/pan_resource.c
+++ b/src/gallium/drivers/panfrost/pan_resource.c
@@ -29,7 +29,7 @@
#include <xf86drm.h>
#include <fcntl.h>
-#include <drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"
#include "state_tracker/winsys_handle.h"
#include "util/u_format.h"
diff --git a/src/gallium/drivers/panfrost/pan_resource.h b/src/gallium/drivers/panfrost/pan_resource.h
index 78baffbd1b2..af92fa48ec9 100644
--- a/src/gallium/drivers/panfrost/pan_resource.h
+++ b/src/gallium/drivers/panfrost/pan_resource.h
@@ -29,7 +29,7 @@
#include <panfrost-job.h>
#include "pan_screen.h"
#include "pan_allocate.h"
-#include <drm.h>
+#include "drm-uapi/drm.h"
struct panfrost_bo {
/* Address to the BO in question */
diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c
index 3590b608818..0995d2f3142 100644
--- a/src/gallium/drivers/panfrost/pan_screen.c
+++ b/src/gallium/drivers/panfrost/pan_screen.c
@@ -41,7 +41,7 @@
#include <fcntl.h>
-#include "drm_fourcc.h"
+#include "drm-uapi/drm_fourcc.h"
#include "pan_screen.h"
#include "pan_resource.h"
diff --git a/src/gallium/drivers/tegra/Makefile.am b/src/gallium/drivers/tegra/Makefile.am
index 1347d2548dc..75328ece242 100644
--- a/src/gallium/drivers/tegra/Makefile.am
+++ b/src/gallium/drivers/tegra/Makefile.am
@@ -2,7 +2,7 @@ include Makefile.sources
include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
- -I$(top_srcdir)/include/drm-uapi \
+ -I$(top_srcdir)/include \
$(GALLIUM_DRIVER_CFLAGS)
noinst_LTLIBRARIES = libtegra.la
diff --git a/src/gallium/drivers/tegra/meson.build b/src/gallium/drivers/tegra/meson.build
index 79ccd143f29..d24438edc13 100644
--- a/src/gallium/drivers/tegra/meson.build
+++ b/src/gallium/drivers/tegra/meson.build
@@ -31,7 +31,7 @@ libtegra = static_library(
c_args : [c_vis_args],
include_directories : [
inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_gallium_drivers,
- inc_gallium_winsys, inc_drm_uapi
+ inc_gallium_winsys,
],
)
diff --git a/src/gallium/drivers/tegra/tegra_screen.c b/src/gallium/drivers/tegra/tegra_screen.c
index 1051c167189..6e7769075d1 100644
--- a/src/gallium/drivers/tegra/tegra_screen.c
+++ b/src/gallium/drivers/tegra/tegra_screen.c
@@ -28,8 +28,8 @@
#include <sys/stat.h>
-#include <drm_fourcc.h>
-#include <tegra_drm.h>
+#include "drm-uapi/drm_fourcc.h"
+#include "drm-uapi/tegra_drm.h"
#include <xf86drm.h>
#include "loader/loader.h"
diff --git a/src/gallium/drivers/v3d/Makefile.am b/src/gallium/drivers/v3d/Makefile.am
index 5b4ed5df2b9..5fb536275fd 100644
--- a/src/gallium/drivers/v3d/Makefile.am
+++ b/src/gallium/drivers/v3d/Makefile.am
@@ -24,7 +24,7 @@ include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
-I$(top_builddir)/src/compiler/nir \
- -I$(top_srcdir)/include/drm-uapi \
+ -I$(top_srcdir)/include \
-I$(top_srcdir)/src/broadcom \
-I$(top_builddir)/src/broadcom \
-I$(top_builddir)/src \
diff --git a/src/gallium/drivers/v3d/meson.build b/src/gallium/drivers/v3d/meson.build
index 9fd80a2e3e5..4f517ada9cd 100644
--- a/src/gallium/drivers/v3d/meson.build
+++ b/src/gallium/drivers/v3d/meson.build
@@ -68,7 +68,7 @@ foreach ver : v3d_versions
[files_per_version, v3d_xml_pack, nir_opcodes_h, nir_builder_opcodes_h],
include_directories : [
inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_broadcom,
- inc_gallium_drivers, inc_drm_uapi,
+ inc_gallium_drivers,
],
c_args : [c_vis_args, v3d_args, '-DV3D_VERSION=' + ver],
cpp_args : [cpp_vis_args],
@@ -82,7 +82,7 @@ libv3d = static_library(
[files_libv3d, v3d_xml_pack],
include_directories : [
inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_broadcom,
- inc_gallium_drivers, inc_drm_uapi,
+ inc_gallium_drivers,
],
c_args : [c_vis_args, v3d_args],
cpp_args : [cpp_vis_args, v3d_args],
diff --git a/src/gallium/drivers/v3d/v3d_context.h b/src/gallium/drivers/v3d/v3d_context.h
index f3309cc3e51..de902ece205 100644
--- a/src/gallium/drivers/v3d/v3d_context.h
+++ b/src/gallium/drivers/v3d/v3d_context.h
@@ -36,7 +36,7 @@
#include "util/bitset.h"
#include "util/slab.h"
#include "xf86drm.h"
-#include "v3d_drm.h"
+#include "drm-uapi/v3d_drm.h"
#include "v3d_screen.h"
#include "broadcom/common/v3d_limits.h"
diff --git a/src/gallium/drivers/v3d/v3d_resource.c b/src/gallium/drivers/v3d/v3d_resource.c
index 84e86799d5e..ddecafe2ec9 100644
--- a/src/gallium/drivers/v3d/v3d_resource.c
+++ b/src/gallium/drivers/v3d/v3d_resource.c
@@ -32,7 +32,7 @@
#include "util/u_upload_mgr.h"
#include "util/u_format_zs.h"
-#include "drm_fourcc.h"
+#include "drm-uapi/drm_fourcc.h"
#include "v3d_screen.h"
#include "v3d_context.h"
#include "v3d_resource.h"
diff --git a/src/gallium/drivers/vc4/Android.mk b/src/gallium/drivers/vc4/Android.mk
index fc141de3ca8..45c95b649a2 100644
--- a/src/gallium/drivers/vc4/Android.mk
+++ b/src/gallium/drivers/vc4/Android.mk
@@ -34,7 +34,7 @@ endif
LOCAL_GENERATED_SOURCES := $(MESA_GEN_NIR_H)
LOCAL_C_INCLUDES := \
- $(MESA_TOP)/include/drm-uapi
+ $(MESA_TOP)/include
# We need libmesa_nir to get NIR's generated include directories.
LOCAL_STATIC_LIBRARIES := \
diff --git a/src/gallium/drivers/vc4/Makefile.am b/src/gallium/drivers/vc4/Makefile.am
index 4c7dd843da5..585ff20e6cf 100644
--- a/src/gallium/drivers/vc4/Makefile.am
+++ b/src/gallium/drivers/vc4/Makefile.am
@@ -28,7 +28,7 @@ endif
AM_CFLAGS = \
-I$(top_builddir)/src/compiler/nir \
- -I$(top_srcdir)/include/drm-uapi \
+ -I$(top_srcdir)/include \
-I$(top_builddir)/src \
-I$(top_srcdir)/src/broadcom \
-I$(top_builddir)/src/broadcom \
diff --git a/src/gallium/drivers/vc4/meson.build b/src/gallium/drivers/vc4/meson.build
index 0d7a03cd242..617578d4593 100644
--- a/src/gallium/drivers/vc4/meson.build
+++ b/src/gallium/drivers/vc4/meson.build
@@ -106,7 +106,7 @@ libvc4 = static_library(
[files_libvc4, v3d_xml_pack],
include_directories : [
inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_broadcom,
- inc_gallium_drivers, inc_drm_uapi,
+ inc_gallium_drivers,
],
link_with: libvc4_neon,
c_args : [c_vis_args, vc4_c_args],
diff --git a/src/gallium/drivers/vc4/vc4_context.h b/src/gallium/drivers/vc4/vc4_context.h
index 1d3179c719c..e7cb831774c 100644
--- a/src/gallium/drivers/vc4/vc4_context.h
+++ b/src/gallium/drivers/vc4/vc4_context.h
@@ -33,7 +33,7 @@
#include "xf86drm.h"
#define __user
-#include "vc4_drm.h"
+#include "drm-uapi/vc4_drm.h"
#include "vc4_bufmgr.h"
#include "vc4_resource.h"
#include "vc4_cl.h"
diff --git a/src/gallium/drivers/vc4/vc4_resource.c b/src/gallium/drivers/vc4/vc4_resource.c
index a4d1b903bce..c12187d7872 100644
--- a/src/gallium/drivers/vc4/vc4_resource.c
+++ b/src/gallium/drivers/vc4/vc4_resource.c
@@ -31,8 +31,8 @@
#include "util/u_transfer_helper.h"
#include "util/u_upload_mgr.h"
-#include "drm_fourcc.h"
-#include "vc4_drm.h"
+#include "drm-uapi/drm_fourcc.h"
+#include "drm-uapi/vc4_drm.h"
#include "vc4_screen.h"
#include "vc4_context.h"
#include "vc4_resource.h"
diff --git a/src/gallium/drivers/vc4/vc4_screen.c b/src/gallium/drivers/vc4/vc4_screen.c
index acb4a1feb0d..5fc8c35f8a9 100644
--- a/src/gallium/drivers/vc4/vc4_screen.c
+++ b/src/gallium/drivers/vc4/vc4_screen.c
@@ -37,8 +37,8 @@
#include "util/ralloc.h"
#include <xf86drm.h>
-#include "drm_fourcc.h"
-#include "vc4_drm.h"
+#include "drm-uapi/drm_fourcc.h"
+#include "drm-uapi/vc4_drm.h"
#include "vc4_screen.h"
#include "vc4_context.h"
#include "vc4_resource.h"
diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c
index ebbbabb6492..e734128b53f 100644
--- a/src/gallium/state_trackers/dri/dri2.c
+++ b/src/gallium/state_trackers/dri/dri2.c
@@ -50,6 +50,8 @@
#include "dri_drawable.h"
#include "dri_query_renderer.h"
+#include "drm-uapi/drm_fourcc.h"
+
#ifndef DRM_FORMAT_MOD_INVALID
#define DRM_FORMAT_MOD_INVALID ((1ULL<<56) - 1)
#endif
diff --git a/src/gallium/state_trackers/va/surface.c b/src/gallium/state_trackers/va/surface.c
index eca63fc76a0..86daf0f7988 100644
--- a/src/gallium/state_trackers/va/surface.c
+++ b/src/gallium/state_trackers/va/surface.c
@@ -45,7 +45,7 @@
#include "va_private.h"
#include <va/va_drmcommon.h>
-#include <drm-uapi/drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"
static const enum pipe_format vpp_surface_formats[] = {
PIPE_FORMAT_B8G8R8A8_UNORM, PIPE_FORMAT_R8G8B8A8_UNORM,
diff --git a/src/gallium/targets/d3dadapter9/drm.c b/src/gallium/targets/d3dadapter9/drm.c
index e08778b81d4..1d01d4a067c 100644
--- a/src/gallium/targets/d3dadapter9/drm.c
+++ b/src/gallium/targets/d3dadapter9/drm.c
@@ -40,7 +40,7 @@
#include "util/xmlconfig.h"
#include "util/xmlpool.h"
-#include <drm.h>
+#include "drm-uapi/drm.h"
#include <sys/ioctl.h>
#include <fcntl.h>
#include <stdio.h>
diff --git a/src/gallium/winsys/i915/drm/i915_drm_batchbuffer.c b/src/gallium/winsys/i915/drm/i915_drm_batchbuffer.c
index 93ce6f224fe..62dc890eb13 100644
--- a/src/gallium/winsys/i915/drm/i915_drm_batchbuffer.c
+++ b/src/gallium/winsys/i915/drm/i915_drm_batchbuffer.c
@@ -2,7 +2,7 @@
#include "i915_drm_winsys.h"
#include "util/u_memory.h"
-#include "i915_drm.h"
+#include "drm-uapi/i915_drm.h"
#include "i915/i915_debug.h"
#include <xf86drm.h>
#include <stdio.h>
diff --git a/src/gallium/winsys/i915/drm/i915_drm_buffer.c b/src/gallium/winsys/i915/drm/i915_drm_buffer.c
index 509984ac6ac..9b525f9809c 100644
--- a/src/gallium/winsys/i915/drm/i915_drm_buffer.c
+++ b/src/gallium/winsys/i915/drm/i915_drm_buffer.c
@@ -2,7 +2,7 @@
#include "i915_drm_winsys.h"
#include "util/u_memory.h"
-#include "i915_drm.h"
+#include "drm-uapi/i915_drm.h"
static char *i915_drm_type_to_name(enum i915_winsys_buffer_type type)
{
diff --git a/src/gallium/winsys/i915/drm/i915_drm_winsys.c b/src/gallium/winsys/i915/drm/i915_drm_winsys.c
index d4a2e013ae6..d07ee496e48 100644
--- a/src/gallium/winsys/i915/drm/i915_drm_winsys.c
+++ b/src/gallium/winsys/i915/drm/i915_drm_winsys.c
@@ -1,7 +1,7 @@
#include <stdio.h>
#include <sys/ioctl.h>
-#include "i915_drm.h"
+#include "drm-uapi/i915_drm.h"
#include "state_tracker/drm_driver.h"
diff --git a/src/gallium/winsys/i915/drm/i915_drm_winsys.h b/src/gallium/winsys/i915/drm/i915_drm_winsys.h
index 56b9e150497..d02e3c278ab 100644
--- a/src/gallium/winsys/i915/drm/i915_drm_winsys.h
+++ b/src/gallium/winsys/i915/drm/i915_drm_winsys.h
@@ -4,7 +4,7 @@
#include "i915/i915_batchbuffer.h"
-#include "drm.h"
+#include "drm-uapi/drm.h"
#include "intel_bufmgr.h"
diff --git a/src/gallium/winsys/svga/drm/vmwgfx_drm.h b/src/gallium/winsys/svga/drm/vmwgfx_drm.h
index 20fbcd727c1..0b1e031292e 100644
--- a/src/gallium/winsys/svga/drm/vmwgfx_drm.h
+++ b/src/gallium/winsys/svga/drm/vmwgfx_drm.h
@@ -29,7 +29,7 @@
#define __VMWGFX_DRM_H__
#ifndef __KERNEL__
-#include <drm.h>
+#include "drm-uapi/drm.h"
#endif
#define DRM_VMW_MAX_SURFACE_FACES 6
diff --git a/src/gallium/winsys/virgl/drm/virtgpu_drm.h b/src/gallium/winsys/virgl/drm/virtgpu_drm.h
index 4be22aa077c..b01a4cd2f51 100644
--- a/src/gallium/winsys/virgl/drm/virtgpu_drm.h
+++ b/src/gallium/winsys/virgl/drm/virtgpu_drm.h
@@ -25,7 +25,7 @@
#define VIRTGPU_DRM_H
#include <stddef.h>
-#include "drm.h"
+#include "drm-uapi/drm.h"
/* Please note that modifications to all structs defined here are
* subject to backwards-compatibility constraints.
diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c
index abbb0b90174..2a6d87ac99d 100644
--- a/src/gbm/backends/dri/gbm_dri.c
+++ b/src/gbm/backends/dri/gbm_dri.c
@@ -39,7 +39,7 @@
#include <unistd.h>
#include <dlfcn.h>
#include <xf86drm.h>
-#include <drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"
#include <GL/gl.h> /* dri_interface needs GL types */
#include <GL/internal/dri_interface.h>
diff --git a/src/intel/Android.dev.mk b/src/intel/Android.dev.mk
index cd2ed66a176..4f14b0362d7 100644
--- a/src/intel/Android.dev.mk
+++ b/src/intel/Android.dev.mk
@@ -29,7 +29,7 @@ LOCAL_MODULE := libmesa_intel_dev
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_C_INCLUDES := $(MESA_TOP)/include/drm-uapi
+LOCAL_C_INCLUDES := $(MESA_TOP)/include
LOCAL_SRC_FILES := $(DEV_FILES)
diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk
index 7019c8cbc8f..04c9d5b3e4e 100644
--- a/src/intel/Android.vulkan.mk
+++ b/src/intel/Android.vulkan.mk
@@ -36,7 +36,6 @@ VULKAN_COMMON_INCLUDES := \
$(MESA_TOP)/src/vulkan/wsi \
$(MESA_TOP)/src/vulkan/util \
$(MESA_TOP)/src/intel \
- $(MESA_TOP)/include/drm-uapi \
$(MESA_TOP)/src/intel/vulkan \
$(MESA_TOP)/src/compiler \
frameworks/native/vulkan/include
diff --git a/src/intel/Makefile.am b/src/intel/Makefile.am
index 5a2518d8d72..a6df653adef 100644
--- a/src/intel/Makefile.am
+++ b/src/intel/Makefile.am
@@ -33,7 +33,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/gtest/include \
-I$(top_builddir)/src/intel \
-I$(top_srcdir)/src/intel \
- -I$(top_srcdir)/include/drm-uapi \
-I$(top_srcdir)/src/mapi \
-I$(top_srcdir)/src/mesa \
-I$(top_srcdir)/src/gallium/auxiliary \
diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am
index cad0a57bc7f..7d9a74c9301 100644
--- a/src/intel/Makefile.vulkan.am
+++ b/src/intel/Makefile.vulkan.am
@@ -109,7 +109,7 @@ VULKAN_CFLAGS = \
VULKAN_CPPFLAGS = \
-I$(top_srcdir)/src/compiler \
-I$(top_srcdir)/src/intel/compiler \
- -I$(top_srcdir)/include/drm-uapi \
+ -I$(top_srcdir)/include \
-I$(top_builddir)/src/intel/vulkan \
-I$(top_srcdir)/src/intel/vulkan \
-I$(top_srcdir)/src/vulkan/wsi \
diff --git a/src/intel/common/gen_defines.h b/src/intel/common/gen_defines.h
index d1d63a17f11..2f8715821cf 100644
--- a/src/intel/common/gen_defines.h
+++ b/src/intel/common/gen_defines.h
@@ -25,7 +25,7 @@
#ifndef GEN_DEFINES_H
#define GEN_DEFINES_H
-#include "i915_drm.h"
+#include "drm-uapi/i915_drm.h"
#ifdef __cplusplus
extern "C" {
diff --git a/src/intel/dev/gen_device_info.c b/src/intel/dev/gen_device_info.c
index 5dbd0607572..b30d31927a6 100644
--- a/src/intel/dev/gen_device_info.c
+++ b/src/intel/dev/gen_device_info.c
@@ -31,7 +31,7 @@
#include "util/bitscan.h"
#include "util/macros.h"
-#include <i915_drm.h>
+#include "drm-uapi/i915_drm.h"
/**
* Get the PCI ID for the device name.
diff --git a/src/intel/dev/meson.build b/src/intel/dev/meson.build
index 9369fd3c0da..a46a4d79226 100644
--- a/src/intel/dev/meson.build
+++ b/src/intel/dev/meson.build
@@ -28,6 +28,6 @@ files_libintel_dev = files(
libintel_dev = static_library(
['intel_dev'],
files_libintel_dev,
- include_directories : [inc_common, inc_intel, inc_drm_uapi],
+ include_directories : [inc_common, inc_intel, inc_include],
c_args : [c_vis_args, no_override_init_args],
)
diff --git a/src/intel/isl/isl_drm.c b/src/intel/isl/isl_drm.c
index e16d7b63917..e7abe747785 100644
--- a/src/intel/isl/isl_drm.c
+++ b/src/intel/isl/isl_drm.c
@@ -24,8 +24,8 @@
#include <assert.h>
#include <stdlib.h>
-#include <drm_fourcc.h>
-#include <i915_drm.h>
+#include "drm-uapi/drm_fourcc.h"
+#include "drm-uapi/i915_drm.h"
#include "isl.h"
#include "dev/gen_device_info.h"
diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build
index 79eb6686059..9117afb4228 100644
--- a/src/intel/isl/meson.build
+++ b/src/intel/isl/meson.build
@@ -81,7 +81,7 @@ isl_tiled_memcpy = static_library(
'isl_tiled_memcpy',
[files_isl_tiled_memcpy],
include_directories : [
- inc_common, inc_intel, inc_drm_uapi,
+ inc_common, inc_intel, inc_include,
],
c_args : [c_vis_args, no_override_init_args, '-msse2'],
extra_files : ['isl_tiled_memcpy.c']
@@ -92,7 +92,7 @@ if with_sse41
'isl_tiled_memcpy_sse41',
[files_isl_tiled_memcpy_sse41],
include_directories : [
- inc_common, inc_intel, inc_drm_uapi,
+ inc_common, inc_intel, inc_include,
],
link_args : ['-Wl,--exclude-libs=ALL'],
c_args : [c_vis_args, no_override_init_args, '-msse2', sse41_args],
@@ -115,7 +115,7 @@ libisl_files = files(
libisl = static_library(
'isl',
[libisl_files, isl_format_layout_c, genX_bits_h],
- include_directories : [inc_common, inc_intel, inc_drm_uapi],
+ include_directories : [inc_common, inc_intel, inc_include],
link_with : [isl_gen_libs, isl_tiled_memcpy, isl_tiled_memcpy_sse41],
c_args : [c_vis_args, no_override_init_args],
)
diff --git a/src/intel/tools/aub_write.c b/src/intel/tools/aub_write.c
index 5d59b4ef28a..99b5e0a7b9f 100644
--- a/src/intel/tools/aub_write.c
+++ b/src/intel/tools/aub_write.c
@@ -29,7 +29,7 @@
#include <stdlib.h>
#include <string.h>
-#include "i915_drm.h"
+#include "drm-uapi/i915_drm.h"
#include "intel_aub.h"
#include "gen_context.h"
diff --git a/src/intel/tools/error2aub.c b/src/intel/tools/error2aub.c
index fb4b4ffcfc6..ca010383847 100644
--- a/src/intel/tools/error2aub.c
+++ b/src/intel/tools/error2aub.c
@@ -33,7 +33,7 @@
#include <zlib.h>
#include "aub_write.h"
-#include "i915_drm.h"
+#include "drm-uapi/i915_drm.h"
#include "intel_aub.h"
static void __attribute__ ((format(__printf__, 2, 3)))
diff --git a/src/intel/tools/intel_dump_gpu.c b/src/intel/tools/intel_dump_gpu.c
index 19e054c894c..ea541bb21fe 100644
--- a/src/intel/tools/intel_dump_gpu.c
+++ b/src/intel/tools/intel_dump_gpu.c
@@ -37,7 +37,7 @@
#include <errno.h>
#include <sys/mman.h>
#include <dlfcn.h>
-#include <i915_drm.h>
+#include "drm-uapi/i915_drm.h"
#include <inttypes.h>
#include "intel_aub.h"
diff --git a/src/intel/tools/intel_sanitize_gpu.c b/src/intel/tools/intel_sanitize_gpu.c
index ddfe1768b4a..543fcf4edde 100644
--- a/src/intel/tools/intel_sanitize_gpu.c
+++ b/src/intel/tools/intel_sanitize_gpu.c
@@ -36,7 +36,7 @@
#include <sys/sysmacros.h>
#include <dlfcn.h>
#include <pthread.h>
-#include <i915_drm.h>
+#include "drm-uapi/i915_drm.h"
#include "util/hash_table.h"
#include "util/u_math.h"
diff --git a/src/intel/tools/meson.build b/src/intel/tools/meson.build
index 2ef49ddc17c..1c061e251ea 100644
--- a/src/intel/tools/meson.build
+++ b/src/intel/tools/meson.build
@@ -61,7 +61,7 @@ error2aub = executable(
'intel_error2aub',
files('aub_write.h', 'aub_write.c', 'error2aub.c'),
dependencies : [dep_zlib, dep_dl, dep_thread, dep_m],
- include_directories : [inc_common, inc_intel, inc_drm_uapi],
+ include_directories : [inc_common, inc_intel, inc_include],
link_with : [libintel_dev],
c_args : [c_vis_args, no_override_init_args],
install : true
@@ -84,7 +84,7 @@ libintel_sanitize_gpu = shared_library(
'intel_sanitize_gpu',
files('intel_sanitize_gpu.c'),
dependencies : [dep_dl, dep_thread],
- include_directories : [inc_common, inc_intel, inc_drm_uapi],
+ include_directories : [inc_common, inc_intel, inc_include],
link_with : [libintel_common, libmesa_util],
c_args : [c_vis_args, no_override_init_args, c_sse2_args],
install_dir : get_option('libexecdir'),
@@ -106,7 +106,7 @@ libintel_dump_gpu = shared_library(
'aub_write.h', 'aub_write.c', 'intel_dump_gpu.c',
),
dependencies : dep_dl,
- include_directories : [inc_common, inc_intel, inc_drm_uapi],
+ include_directories : [inc_common, inc_intel, inc_include],
link_with : libintel_dev,
c_args : [c_vis_args, no_override_init_args],
install_dir : get_option('libexecdir'),
diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index 77120937c51..74739c0da51 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -29,7 +29,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <xf86drm.h>
-#include <drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"
#include "anv_private.h"
#include "util/strtod.h"
diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c
index 7e9ae1ab4c4..4e15e626eed 100644
--- a/src/intel/vulkan/anv_formats.c
+++ b/src/intel/vulkan/anv_formats.c
@@ -22,7 +22,7 @@
*/
#include "anv_private.h"
-#include "drm_fourcc.h"
+#include "drm-uapi/drm_fourcc.h"
#include "vk_enum_to_str.h"
#include "vk_format_info.h"
#include "vk_util.h"
diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c
index 3999c7399d0..facf7d18006 100644
--- a/src/intel/vulkan/anv_image.c
+++ b/src/intel/vulkan/anv_image.c
@@ -27,7 +27,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <sys/mman.h>
-#include <drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"
#include "anv_private.h"
#include "util/debug.h"
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index 5fb7c71da40..60da96a134e 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -30,7 +30,7 @@
#include <pthread.h>
#include <assert.h>
#include <stdint.h>
-#include <i915_drm.h>
+#include "drm-uapi/i915_drm.h"
#ifdef HAVE_VALGRIND
#include <valgrind.h>
diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
index ffd1985f251..7fa43a6ad79 100644
--- a/src/intel/vulkan/meson.build
+++ b/src/intel/vulkan/meson.build
@@ -98,7 +98,7 @@ foreach g : [['70', ['gen7_cmd_buffer.c']], ['75', ['gen7_cmd_buffer.c']],
'anv_gen@0@'.format(_gen),
[anv_gen_files, g[1], anv_entrypoints[0], anv_extensions_h],
include_directories : [
- inc_common, inc_compiler, inc_drm_uapi, inc_intel, inc_vulkan_util,
+ inc_common, inc_compiler, inc_include, inc_intel, inc_vulkan_util,
inc_vulkan_wsi,
],
c_args : [
@@ -183,7 +183,7 @@ libanv_common = static_library(
gen_xml_pack,
],
include_directories : [
- inc_common, inc_intel, inc_compiler, inc_drm_uapi, inc_vulkan_util,
+ inc_common, inc_intel, inc_compiler, inc_include, inc_vulkan_util,
inc_vulkan_wsi,
],
c_args : anv_flags,
@@ -194,7 +194,7 @@ libvulkan_intel = shared_library(
'vulkan_intel',
[files('anv_gem.c'), anv_entrypoints[0], anv_extensions_h],
include_directories : [
- inc_common, inc_intel, inc_compiler, inc_drm_uapi, inc_vulkan_util,
+ inc_common, inc_intel, inc_compiler, inc_include, inc_vulkan_util,
inc_vulkan_wsi,
],
link_whole : [libanv_common, libanv_gen_libs],
@@ -215,7 +215,7 @@ if with_tests
'vulkan_intel_test',
[files('anv_gem_stubs.c'), anv_entrypoints[0], anv_extensions_h],
include_directories : [
- inc_common, inc_intel, inc_compiler, inc_drm_uapi, inc_vulkan_util,
+ inc_common, inc_intel, inc_compiler, inc_include, inc_vulkan_util,
inc_vulkan_wsi,
],
link_whole : libanv_common,
diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am
index 3c22e0ae7e6..fbefdaee5da 100644
--- a/src/loader/Makefile.am
+++ b/src/loader/Makefile.am
@@ -31,7 +31,6 @@ AM_CPPFLAGS = \
-DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" \
$(DEFINES) \
-I$(top_srcdir)/include \
- -I$(top_srcdir)/include/drm-uapi \
-I$(top_srcdir)/src \
$(VISIBILITY_CFLAGS) \
$(XCB_DRI3_CFLAGS) \
diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c
index 7d61c1df4fc..7ef59f0477b 100644
--- a/src/loader/loader_dri3_helper.c
+++ b/src/loader/loader_dri3_helper.c
@@ -35,7 +35,7 @@
#include "loader_dri3_helper.h"
#include "util/macros.h"
-#include "drm_fourcc.h"
+#include "drm-uapi/drm_fourcc.h"
/* From xmlpool/options.h, user exposed so should be stable */
#define DRI_CONF_VBLANK_NEVER 0
diff --git a/src/loader/meson.build b/src/loader/meson.build
index e280ba41cc2..69c81688bf4 100644
--- a/src/loader/meson.build
+++ b/src/loader/meson.build
@@ -25,7 +25,7 @@ if with_platform_x11 and with_dri3
'loader_dri3_helper',
['loader_dri3_helper.c', 'loader_dri3_helper.h'],
c_args : c_vis_args,
- include_directories : [inc_include, inc_src, inc_drm_uapi],
+ include_directories : [inc_include, inc_src],
dependencies : [
dep_libdrm, dep_xcb_dri3, dep_xcb_present, dep_xcb_sync, dep_xshmfence,
],
diff --git a/src/mesa/drivers/dri/i915/intel_buffers.h b/src/mesa/drivers/dri/i915/intel_buffers.h
index 6e22f5125b9..9fa4174eefc 100644
--- a/src/mesa/drivers/dri/i915/intel_buffers.h
+++ b/src/mesa/drivers/dri/i915/intel_buffers.h
@@ -30,7 +30,7 @@
#define INTEL_BUFFERS_H
#include "dri_util.h"
-#include "drm.h"
+#include "drm-uapi/drm.h"
#include "intel_context.h"
struct intel_context;
diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h
index b79288d29bc..6613356010a 100644
--- a/src/mesa/drivers/dri/i915/intel_context.h
+++ b/src/mesa/drivers/dri/i915/intel_context.h
@@ -34,9 +34,9 @@
#include "main/mtypes.h"
#include "main/errors.h"
-#include <drm.h>
+#include "drm-uapi/drm.h"
#include <intel_bufmgr.h>
-#include <i915_drm.h>
+#include "drm-uapi/i915_drm.h"
#include "intel_screen.h"
#include "intel_tex_obj.h"
diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c
index 79f2113a468..f3aa4f27155 100644
--- a/src/mesa/drivers/dri/i915/intel_screen.c
+++ b/src/mesa/drivers/dri/i915/intel_screen.c
@@ -93,7 +93,7 @@ DRI_CONF_END
#include "intel_tex.h"
#include "intel_regions.h"
-#include "i915_drm.h"
+#include "drm-uapi/i915_drm.h"
/**
* For debugging purposes, this returns a time in seconds.
diff --git a/src/mesa/drivers/dri/i915/intel_screen.h b/src/mesa/drivers/dri/i915/intel_screen.h
index 359cf313475..80f6df41aac 100644
--- a/src/mesa/drivers/dri/i915/intel_screen.h
+++ b/src/mesa/drivers/dri/i915/intel_screen.h
@@ -32,7 +32,7 @@
#include <sys/time.h>
#include "dri_util.h"
#include "intel_bufmgr.h"
-#include "i915_drm.h"
+#include "drm-uapi/i915_drm.h"
#include "util/xmlconfig.h"
struct intel_screen
diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk
index 1574c8834c9..b9ce93f7a97 100644
--- a/src/mesa/drivers/dri/i965/Android.mk
+++ b/src/mesa/drivers/dri/i965/Android.mk
@@ -30,7 +30,7 @@ include $(LOCAL_PATH)/Makefile.sources
I965_PERGEN_COMMON_INCLUDES := \
$(MESA_DRI_C_INCLUDES) \
$(MESA_TOP)/src/intel \
- $(MESA_TOP)/include/drm-uapi
+ $(MESA_TOP)/include
I965_PERGEN_SHARED_LIBRARIES := \
$(MESA_DRI_SHARED_LIBRARIES)
@@ -277,7 +277,7 @@ LOCAL_CFLAGS := \
LOCAL_C_INCLUDES := \
$(MESA_DRI_C_INCLUDES) \
$(call generated-sources-dir-for,STATIC_LIBRARIES,libmesa_glsl,,) \
- $(MESA_TOP)/include/drm-uapi
+ $(MESA_TOP)/include
LOCAL_SRC_FILES := \
$(i965_FILES)
diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index 0bda2897e8e..d7d7db208da 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -41,7 +41,7 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/compiler/nir \
-I$(top_builddir)/src/intel \
-I$(top_srcdir)/src/intel \
- -I$(top_srcdir)/include/drm-uapi \
+ -I$(top_srcdir)/include \
$(DEFINES) \
$(VISIBILITY_CFLAGS) \
$(WNO_OVERRIDE_INIT) \
diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.c b/src/mesa/drivers/dri/i965/brw_bufmgr.c
index f1675b191c1..b33a30930db 100644
--- a/src/mesa/drivers/dri/i965/brw_bufmgr.c
+++ b/src/mesa/drivers/dri/i965/brw_bufmgr.c
@@ -67,7 +67,7 @@
#include "brw_context.h"
#include "string.h"
-#include "i915_drm.h"
+#include "drm-uapi/i915_drm.h"
#ifdef HAVE_VALGRIND
#include <valgrind.h>
diff --git a/src/mesa/drivers/dri/i965/brw_performance_query.c b/src/mesa/drivers/dri/i965/brw_performance_query.c
index 10e3d024f17..786569d227f 100644
--- a/src/mesa/drivers/dri/i965/brw_performance_query.c
+++ b/src/mesa/drivers/dri/i965/brw_performance_query.c
@@ -56,7 +56,7 @@
#include <sys/ioctl.h>
#include <xf86drm.h>
-#include <i915_drm.h>
+#include "drm-uapi/i915_drm.h"
#include "main/hash.h"
#include "main/macros.h"
diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
index 7e3988c96b0..0377c677c4c 100644
--- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c
+++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
@@ -37,7 +37,7 @@
#include "util/hash_table.h"
#include <xf86drm.h>
-#include <i915_drm.h>
+#include "drm-uapi/i915_drm.h"
#define FILE_DEBUG_FLAG DEBUG_BUFMGR
diff --git a/src/mesa/drivers/dri/i965/intel_buffers.h b/src/mesa/drivers/dri/i965/intel_buffers.h
index 0e0d9c31f2b..b5ab49f8013 100644
--- a/src/mesa/drivers/dri/i965/intel_buffers.h
+++ b/src/mesa/drivers/dri/i965/intel_buffers.h
@@ -27,7 +27,7 @@
#define INTEL_BUFFERS_H
#include "dri_util.h"
-#include "drm.h"
+#include "drm-uapi/drm.h"
#include "brw_context.h"
extern void intelInitBufferFuncs(struct dd_function_table *functions);
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index b4e3524aa51..fe77d72fae4 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -25,7 +25,7 @@
#include <GL/gl.h>
#include <GL/internal/dri_interface.h>
-#include <drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"
#include "intel_batchbuffer.h"
#include "intel_image.h"
diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index ece4ce0e334..7f6b69713c1 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -23,7 +23,7 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"
#include <errno.h>
#include <time.h>
#include <unistd.h>
@@ -111,7 +111,7 @@ DRI_CONF_END
#include "brw_context.h"
-#include "i915_drm.h"
+#include "drm-uapi/i915_drm.h"
/**
* For debugging purposes, this returns a time in seconds.
diff --git a/src/mesa/drivers/dri/i965/intel_screen.h b/src/mesa/drivers/dri/i965/intel_screen.h
index 8d56fcd9e7a..2a21d4e19ee 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.h
+++ b/src/mesa/drivers/dri/i965/intel_screen.h
@@ -35,7 +35,7 @@
#include "dri_util.h"
#include "brw_bufmgr.h"
#include "dev/gen_device_info.h"
-#include "i915_drm.h"
+#include "drm-uapi/i915_drm.h"
#include "util/xmlconfig.h"
#include "isl/isl.h"
diff --git a/src/mesa/drivers/dri/i965/meson.build b/src/mesa/drivers/dri/i965/meson.build
index cd3683ae7ec..ea63af9cc4b 100644
--- a/src/mesa/drivers/dri/i965/meson.build
+++ b/src/mesa/drivers/dri/i965/meson.build
@@ -179,7 +179,7 @@ libi965 = static_library(
[files_i965, i965_oa_sources, ir_expression_operation_h,
xmlpool_options_h, float64_glsl_h],
include_directories : [
- inc_common, inc_intel, inc_dri_common, inc_util, inc_drm_uapi,
+ inc_common, inc_intel, inc_dri_common, inc_util, inc_include,
],
c_args : [c_vis_args, no_override_init_args, c_sse2_args],
cpp_args : [cpp_vis_args, c_sse2_args],
diff --git a/src/mesa/drivers/dri/r200/r200_context.h b/src/mesa/drivers/dri/r200/r200_context.h
index f9ba6835e80..8ac39f1c575 100644
--- a/src/mesa/drivers/dri/r200/r200_context.h
+++ b/src/mesa/drivers/dri/r200/r200_context.h
@@ -36,7 +36,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define __R200_CONTEXT_H__
#include "tnl/t_vertex.h"
-#include "drm.h"
+#include "drm-uapi/drm.h"
#include "radeon_drm.h"
#include "dri_util.h"
diff --git a/src/mesa/drivers/dri/r200/r200_ioctl.h b/src/mesa/drivers/dri/r200/r200_ioctl.h
index 42feec76e65..d3cb1eae8f8 100644
--- a/src/mesa/drivers/dri/r200/r200_ioctl.h
+++ b/src/mesa/drivers/dri/r200/r200_ioctl.h
@@ -39,7 +39,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "radeon_cs_gem.h"
#include "xf86drm.h"
-#include "drm.h"
+#include "drm-uapi/drm.h"
#include "radeon_drm.h"
extern void r200EmitMaxVtxIndex(r200ContextPtr rmesa, int count);
diff --git a/src/mesa/drivers/dri/radeon/radeon_context.h b/src/mesa/drivers/dri/radeon/radeon_context.h
index 94917cf30b6..21f6034db6c 100644
--- a/src/mesa/drivers/dri/radeon/radeon_context.h
+++ b/src/mesa/drivers/dri/radeon/radeon_context.h
@@ -45,7 +45,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "tnl/t_vertex.h"
#include "dri_util.h"
-#include "drm.h"
+#include "drm-uapi/drm.h"
#include "radeon_drm.h"
#include "main/macros.h"
#include "main/mtypes.h"
diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am
index dc7e32aaa68..cc738d5c9a5 100644
--- a/src/vulkan/Makefile.am
+++ b/src/vulkan/Makefile.am
@@ -30,7 +30,6 @@ libvulkan_util_la_SOURCES = $(VULKAN_UTIL_SOURCES)
AM_CPPFLAGS = \
$(DEFINES) \
-I$(top_srcdir)/include \
- -I$(top_srcdir)/include/drm-uapi \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/vulkan/util \
-I$(top_srcdir)/src/gallium/auxiliary \
diff --git a/src/vulkan/wsi/meson.build b/src/vulkan/wsi/meson.build
index e9812b663e4..41e9c27ce8d 100644
--- a/src/vulkan/wsi/meson.build
+++ b/src/vulkan/wsi/meson.build
@@ -62,7 +62,7 @@ endif
libvulkan_wsi = static_library(
'vulkan_wsi',
files_vulkan_wsi,
- include_directories : [inc_common, inc_vulkan_util, inc_drm_uapi],
+ include_directories : [inc_common, inc_vulkan_util, inc_include],
dependencies : [vulkan_wsi_deps, dep_libdrm],
c_args : [c_vis_args, vulkan_wsi_args],
build_by_default : false,
diff --git a/src/vulkan/wsi/wsi_common.c b/src/vulkan/wsi/wsi_common.c
index e5dc1bb4c74..783b954a5c5 100644
--- a/src/vulkan/wsi/wsi_common.c
+++ b/src/vulkan/wsi/wsi_common.c
@@ -22,7 +22,7 @@
*/
#include "wsi_common_private.h"
-#include "drm_fourcc.h"
+#include "drm-uapi/drm_fourcc.h"
#include "util/macros.h"
#include "vk_util.h"
diff --git a/src/vulkan/wsi/wsi_common_display.c b/src/vulkan/wsi/wsi_common_display.c
index 08e9e5fe3fc..7ff9d77d88b 100644
--- a/src/vulkan/wsi/wsi_common_display.c
+++ b/src/vulkan/wsi/wsi_common_display.c
@@ -32,7 +32,7 @@
#include <math.h>
#include <xf86drm.h>
#include <xf86drmMode.h>
-#include <drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"
#ifdef VK_USE_PLATFORM_XLIB_XRANDR_EXT
#include <xcb/randr.h>
#include <X11/Xlib-xcb.h>
diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c
index 1bdae7307ac..fac34304044 100644
--- a/src/vulkan/wsi/wsi_common_wayland.c
+++ b/src/vulkan/wsi/wsi_common_wayland.c
@@ -31,7 +31,7 @@
#include <string.h>
#include <pthread.h>
-#include <drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"
#include "vk_util.h"
#include "wsi_common_private.h"
diff --git a/src/vulkan/wsi/wsi_common_x11.c b/src/vulkan/wsi/wsi_common_x11.c
index 3604fe46786..52d820869a8 100644
--- a/src/vulkan/wsi/wsi_common_x11.c
+++ b/src/vulkan/wsi/wsi_common_x11.c
@@ -36,7 +36,7 @@
#include <fcntl.h>
#include <poll.h>
#include <xf86drm.h>
-#include <drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"
#include "util/hash_table.h"
#include "vk_util.h"