drm-uapi: use local files, not system libdrm

There was an issue recently caused by the system header being included
by mistake, so let's just get rid of this include path and always
explicitly #include "drm-uapi/FOO.h"

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Kristian H. Kristensen <hoegsberg@chromium.org>

diff --git a/include/meson.build b/include/meson.build
index 081c1bc00088c956d47e1d90360b26cbdf3b0883..a9fadc09721463b4a8d5d1fc859b321dcaa91360 100644 (file)
--- a/include/meson.build
+++ b/include/meson.build
@@ -18,7 +18,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 

-inc_drm_uapi = include_directories('drm-uapi')

 inc_vulkan = include_directories('vulkan')
 inc_d3d9 = include_directories('D3D9')
 inc_gl_internal = include_directories('GL/internal')
 inc_vulkan = include_directories('vulkan')
 inc_d3d9 = include_directories('D3D9')
 inc_gl_internal = include_directories('GL/internal')

diff --git a/src/egl/Android.mk b/src/egl/Android.mk
index 42b391e6d869b1f8b620ef1b6bc92ab6b860b054..e78dd48f3ec60e24352e3d6719c115c5fc87bcf9 100644 (file)
--- a/src/egl/Android.mk
+++ b/src/egl/Android.mk
@@ -43,7 +43,7 @@ LOCAL_CFLAGS := \
        -DHAVE_ANDROID_PLATFORM
 
 LOCAL_C_INCLUDES := \
        -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
 
        $(MESA_TOP)/src/egl/main \
        $(MESA_TOP)/src/egl/drivers/dri2
 

diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index de4a754a2dbde1628daff059f431aed3dc871d17..4383cca1e004c413536475a44aa829f7db4b36b0 100644 (file)
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -27,7 +27,6 @@ BUILT_SOURCES =
 
 AM_CFLAGS = \
        -I$(top_srcdir)/include \
 
 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 \
        -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 153fdc089234ba398c3dfd393c7b7e0a85aec1da..927092d22847dfbdb291b02dd65c511eef17f768 100644 (file)
--- a/src/egl/SConscript
+++ b/src/egl/SConscript
@@ -8,7 +8,6 @@ env = env.Clone()
 
 env.Append(CPPPATH = [
     '#/include',
 
 env.Append(CPPPATH = [
     '#/include',

-    '#/include/drm-uapi',

     '#/include/HaikuGL',
     '#/src/egl/main',
     '#/src',
     '#/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 17bee797b4a31b4899990da5690424fb71b86d15..0f417e571bb02082c183d40510b7008e4c90fb18 100644 (file)
--- 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 <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>
 #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 c3ca1b6f7bc12716619874db6aed0984cabf75b5..8be4db7f2584eb2b12c055a70b8087748bff79ea 100644 (file)
--- 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 <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"
 #include <sys/mman.h>
 
 #include "egl_dri2.h"

diff --git a/src/egl/meson.build b/src/egl/meson.build
index a23cc36fc2b8b1ead88c0cb299ea4875cc8d3061..f4293f1f4f74011929612447ab235a1ff38e495c 100644 (file)
--- 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 = []
 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',
 
 files_egl = files(
   'main/eglapi.c',

diff --git a/src/freedreno/drm/msm_drm.h b/src/freedreno/drm/msm_drm.h
index 91a16b333c69005417b9314d192b0db0eac43b19..6623a61093ad282dbec7105c6fa9dfa51084f117 100644 (file)
--- 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__
 
 #ifndef __MSM_DRM_H__
 #define __MSM_DRM_H__
 

-#include "drm.h"
+#include "drm-uapi/drm.h"

 
 #if defined(__cplusplus)
 extern "C" {
 
 #if defined(__cplusplus)
 extern "C" {

diff --git a/src/gallium/drivers/etnaviv/etnaviv_resource.c b/src/gallium/drivers/etnaviv/etnaviv_resource.c
index 9a7ebf3064e6652914194559e7d89ec1f5e4ab18..418effa92d7c419a521365244fa8c94ed24cebd6 100644 (file)
--- 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 "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)
 
 #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 35dcac1409bce946df449062b70e57e214aeb239..de822fc85caa0f466559cbbaa1770a304e8b6cdb 100644 (file)
--- 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 "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)
 
 #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 b06f20531fded8eff71ea9a18c4c25d18a182e53..c4d5332405471478679669448844b01cbb1d9ebf 100644 (file)
--- 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 "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,
 
 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 ef2a7bd581ca682732fa3fc370f433b6730a09fe..3b55313074cc36bc0cb8f521d24492179e6049b9 100644 (file)
--- 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 "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,
 
 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 0294697af285dfa67449717d21b0fb017442c814..0b7411b47efa2d76092e47752086a5d82e242b10 100644 (file)
--- 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 "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
 
 /* 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 e579264924ff7ae43299230e061633a9270d1c3a..ccd88a7d16c39d9cd323dc35b974d3966f45ec37 100644 (file)
--- 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 \
 
 LOCAL_C_INCLUDES := \
        $(LOCAL_PATH)/ir3 \

-       $(MESA_TOP)/include/drm-uapi
+       $(MESA_TOP)/include

 
 LOCAL_GENERATED_SOURCES := $(MESA_GEN_NIR_H)
 
 
 LOCAL_GENERATED_SOURCES := $(MESA_GEN_NIR_H)
 

diff --git a/src/gallium/drivers/freedreno/Makefile.am b/src/gallium/drivers/freedreno/Makefile.am
index dbc15f403898e7b2e05e89b8ef947959fc01d342..c002378dfb1687c94c876cb27ddc1d6f2a02e101 100644 (file)
--- 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 \
 
 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 \
        -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 5f99a7ca60ca3a6ede84308e4d07273777fd72c6..f2ad2c517c6b31c1e4011f9efbe32485917f8a36 100644 (file)
--- 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 "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' */
 #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 c3b08ab0e0fdf0fbd23c94ed8e33f76c10fb49bb..c5a96a87dc049c379f6ec6766cdbaa500823f4b1 100644 (file)
--- 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 "util/os_time.h"
 

-#include <drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"

 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.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 a446774a86e8734d6de1429aaf39537352473eec..cd2dd0938f442c99dfbb5f3eb239547858dbaeab 100644 (file)
--- 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 := \
        $(NVC0_C_SOURCES)
 
 LOCAL_C_INCLUDES := \

-       $(MESA_TOP)/include/drm-uapi
+       $(MESA_TOP)/include

 
 LOCAL_SHARED_LIBRARIES := libdrm_nouveau
 LOCAL_MODULE := libmesa_pipe_nouveau
 
 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 f6126b544811a9f2556c5d35c236f6c914cdddcd..48c0fdf512db0a68c83756eb5fa135ed4c08e924 100644 (file)
--- 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 = \
 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)
        $(GALLIUM_DRIVER_CFLAGS) \
        $(LIBDRM_CFLAGS) \
        $(NOUVEAU_CFLAGS)

diff --git a/src/gallium/drivers/nouveau/meson.build b/src/gallium/drivers/nouveau/meson.build
index 242ee0e0001bf3ab8cc14fec1237b63a9df46824..4192967f82d6867aac213655bba1462a6c6204bb 100644 (file)
--- 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 : [
   '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],
   ],
   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 f13988ea5265c29daa64e6cdd93bbbe024989ddd..e0ed0af3eaa3fa2013d142efcc4618999f573239 100644 (file)
--- 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 "pipe/p_defines.h"
 

-#include <drm.h>
+#include "drm-uapi/drm.h"

 #include <nouveau.h>
 
 #ifndef NV04_PFIFO_MAX_PACKET_LEN
 #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 7983c4030876538631e95154d4d877f9e0508912..af5baa3def060b32e084ae39053c7098a6f2cecc 100644 (file)
--- 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.
  */
 
  * 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"
 
 #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 ec6257a8963384b935492349284b81ea660c01da..d73ecf71624c6ff2ee0e5db20cb3259e0a21f0b9 100644 (file)
--- 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"
 
 #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 5e799eae11965bb3dc7f15f2d21ad4efbc0140cf..17fdb5e1e0d5dce9452bc7060b680c308e76aa15 100644 (file)
--- 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_common,
   inc_gallium,
   inc_gallium_aux,

-  inc_drm_uapi,

   inc_include,
   inc_src,
   include_directories('include'),
   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 4864ffb4fd336740c64859b03a8a9b117c4cca47..a38ab5e9928c380e1f946f02c1b2bb0374718f87 100644 (file)
--- 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 <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"
 
 #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 78baffbd1b2c4e08a74ce787302603f486676960..af92fa48ec94f161e9e9f8cbdfeaa564871bafa9 100644 (file)
--- 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 <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 */
 
 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 3590b608818af90868ab55d669e9c4b4c397c240..0995d2f3142a88809fd34582c95df92ae2b195cb 100644 (file)
--- a/src/gallium/drivers/panfrost/pan_screen.c
+++ b/src/gallium/drivers/panfrost/pan_screen.c
@@ -41,7 +41,7 @@
 
 #include <fcntl.h>
 
 
 #include <fcntl.h>
 

-#include "drm_fourcc.h"
+#include "drm-uapi/drm_fourcc.h"

 
 #include "pan_screen.h"
 #include "pan_resource.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 1347d2548dc88483b542b7ab273a03b6f542499f..75328ece242b665b8eb0f7c9bbbbbddd00f03585 100644 (file)
--- 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 = \
 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
        $(GALLIUM_DRIVER_CFLAGS)
 
 noinst_LTLIBRARIES = libtegra.la

diff --git a/src/gallium/drivers/tegra/meson.build b/src/gallium/drivers/tegra/meson.build
index 79ccd143f2928777e579ea8f0420105b740debf4..d24438edc1383d571552d2a99c00bc374b99c57f 100644 (file)
--- 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,
   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 1051c167189f85ab669e5883ca0902fc2f314cea..6e7769075d1e4af07d1a0f58200e1ae583930d72 100644 (file)
--- 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 <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"
 #include <xf86drm.h>
 
 #include "loader/loader.h"

diff --git a/src/gallium/drivers/v3d/Makefile.am b/src/gallium/drivers/v3d/Makefile.am
index 5b4ed5df2b996b8d5d57abda6a0a7bb91ed8068c..5fb536275fdf7fd11140c525bfc62aa74e3b5ecc 100644 (file)
--- 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 \
 
 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 \
        -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 9fd80a2e3e536d7149d4f6c7dfbbe8d3193cb275..4f517ada9cd12b395a34da78173cb130d61f566f 100644 (file)
--- 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,
     [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],
     ],
     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,
   [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],
   ],
   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 f3309cc3e513dd30d80428fed1d83063f18886b3..de902ece2050f31d8534e83c38c0d1f6ee2685fe 100644 (file)
--- 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 "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"
 
 #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 84e86799d5ec80c28128c0ad78dc45f978fd6f35..ddecafe2ec94f1d96c9ccf50d10a29223867ffa2 100644 (file)
--- 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 "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"
 #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 fc141de3ca8ef8a5e5f507c41bbdf04b88812555..45c95b649a24301843e5a9f53ccdee0c4b2de0fe 100644 (file)
--- 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 := \
 
 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 := \
 
 # 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 4c7dd843da57d1f74215ceca67134b89c07ce5bf..585ff20e6cf49959013a19a0b6d83db73e706095 100644 (file)
--- 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 \
 
 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 \
        -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 0d7a03cd242b6931220471bc3aaecd12a354aab6..617578d4593c7795ac7b7995c11b69162d652e5d 100644 (file)
--- 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,
   [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],
   ],
   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 1d3179c719c1a4fb1f941d5ba46182558a2c654b..e7cb831774ce2a4b1a5a8eb8e60addaa6bfa399e 100644 (file)
--- 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 "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"
 #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 a4d1b903bce1140d8293ead0d3d671ce5fbd1bd6..c12187d787297195c7b80325c789e3cef61fa9ba 100644 (file)
--- 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 "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"
 #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 acb4a1feb0d37adaf223a2f275a97e6189a76216..5fc8c35f8a952dcefcd418476601e9a9f6a64659 100644 (file)
--- 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 "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"
 #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 ebbbabb6492af4a42ce9b80a45dbfa582cd7924f..e734128b53f57ff6548fcf5bcbeb5376adabb329 100644 (file)
--- 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 "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
 #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 eca63fc76a08e0dd24de63460beb83af4ad4ad0d..86daf0f7988ecd8e69fea4decb354435215ec594 100644 (file)
--- 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 "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,
 
 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 e08778b81d429aba43ff78169375a8c26f5eb869..1d01d4a067cc9d1e5631033211a5bcdb265a5ff0 100644 (file)
--- 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 "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>
 #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 93ce6f224fedfa3c556f655e803e45d624d42039..62dc890eb1382c5ff10d5734d886022089f624fb 100644 (file)
--- 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_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>
 #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 509984ac6ac4e7a1b781760f3262fd46a1667a05..9b525f9809c9b612660c85193bbd1caf1e263a44 100644 (file)
--- 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_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)
 {
 
 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 d4a2e013ae6e35abef4a76b0632e849f0839127e..d07ee496e485a35cca55d1ae9ff5eec13a3f3760 100644 (file)
--- 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 <stdio.h>
 #include <sys/ioctl.h>
 

-#include "i915_drm.h"
+#include "drm-uapi/i915_drm.h"

 
 #include "state_tracker/drm_driver.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 56b9e1504973161219f772ebb8d966ea3717a073..d02e3c278ab6dcc3fbfcd5b58843b693e98ea572 100644 (file)
--- 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 "i915/i915_batchbuffer.h"
 

-#include "drm.h"
+#include "drm-uapi/drm.h"

 #include "intel_bufmgr.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 20fbcd727c1a42294818ddb72caf88a9b6cc8347..0b1e031292eeec487662eae042631091a5a81580 100644 (file)
--- 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__
 #define __VMWGFX_DRM_H__
 
 #ifndef __KERNEL__

-#include <drm.h>
+#include "drm-uapi/drm.h"

 #endif
 
 #define DRM_VMW_MAX_SURFACE_FACES 6
 #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 4be22aa077c829b75196ad9c4bbd04327c1fe972..b01a4cd2f51598619f475678567eaa7a651d7cf4 100644 (file)
--- 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>
 #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.
 
 /* 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 abbb0b90174d3eac2afccfd59dadf6456d70e163..2a6d87ac99daed0229bf3f5c57ba87f71c0a7733 100644 (file)
--- 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 <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>
 
 #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 cd2ed66a176857fd0099cf932503edb225a89b39..4f14b0362d7ae6280370ed57476c70be6200fc20 100644 (file)
--- 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_MODULE_CLASS := STATIC_LIBRARIES
 

-LOCAL_C_INCLUDES := $(MESA_TOP)/include/drm-uapi
+LOCAL_C_INCLUDES := $(MESA_TOP)/include

 
 LOCAL_SRC_FILES := $(DEV_FILES)
 
 
 LOCAL_SRC_FILES := $(DEV_FILES)
 

diff --git a/src/intel/Android.vulkan.mk b/src/intel/Android.vulkan.mk
index 7019c8cbc8f51ff2343d2d96823486003e087e95..04c9d5b3e4e3548e437b22540ad7d57f6a7f4388 100644 (file)
--- 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)/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
        $(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 5a2518d8d72942507dc2bff6c579d9f57492b525..a6df653adef1f40e5c765a0279a9414337c5df57 100644 (file)
--- 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)/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 \
        -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 cad0a57bc7f390430f10adff942faf68e7a4a1bb..7d9a74c930155f3c56937af2b0513ed1bc6b4117 100644 (file)
--- 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 \
 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 \
        -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 d1d63a17f11d3d50ad732df19959ce17b81029ec..2f8715821cf9a2e0efa6ab913d8db30c1b01acd3 100644 (file)
--- 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
 
 #ifndef GEN_DEFINES_H
 #define GEN_DEFINES_H
 

-#include "i915_drm.h"
+#include "drm-uapi/i915_drm.h"

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/intel/dev/gen_device_info.c b/src/intel/dev/gen_device_info.c
index 5dbd06075722f8cc644e82762e83411c31ec674b..b30d31927a6841f8d60aa54ab539a332a43e35d5 100644 (file)
--- 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 "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.
 
 /**
  * Get the PCI ID for the device name.

diff --git a/src/intel/dev/meson.build b/src/intel/dev/meson.build
index 9369fd3c0dae996e6b5dfce14488f857672e7183..a46a4d79226b4508545d1025ed7a3a586197fb4a 100644 (file)
--- 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,
 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],
 )
   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 e16d7b639170a866760e0af72c66ede780c09e21..e7abe74778516fcd01f7a0a7bc366f4c93b8acbe 100644 (file)
--- 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 <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"
 
 #include "isl.h"
 #include "dev/gen_device_info.h"

diff --git a/src/intel/isl/meson.build b/src/intel/isl/meson.build
index 79eb668605959d727bf71c5c9b13f7a57cd4d6e6..9117afb422840ff374b441f32dca24cd180e8fa4 100644 (file)
--- 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 : [
   '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']
   ],
   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 : [
     '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],
     ],
     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],
 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],
 )
   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 5d59b4ef28a5c6dfe4dc4bb1f5c7dc539c099f2b..99b5e0a7b9f77fb56cdb3ae573a743568cd80267 100644 (file)
--- 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 <stdlib.h>
 #include <string.h>
 

-#include "i915_drm.h"
+#include "drm-uapi/i915_drm.h"

 #include "intel_aub.h"
 #include "gen_context.h"
 
 #include "intel_aub.h"
 #include "gen_context.h"
 

diff --git a/src/intel/tools/error2aub.c b/src/intel/tools/error2aub.c
index fb4b4ffcfc6ce0262b8709a452973be0d9154115..ca01038384776abc4b021fc18abf89315111fd0f 100644 (file)
--- a/src/intel/tools/error2aub.c
+++ b/src/intel/tools/error2aub.c
@@ -33,7 +33,7 @@
 #include <zlib.h>
 
 #include "aub_write.h"
 #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)))
 #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 19e054c894c4a48b0a4a693cafd8f98e78b67497..ea541bb21fe0267ea735008f6df8bff957b0ebcc 100644 (file)
--- 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 <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"
 #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 ddfe1768b4a84aeae84ec81c8813be696aa6842c..543fcf4eddeb0a63f7b202b5af7b6af12072c1f0 100644 (file)
--- 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 <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"
 
 #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 2ef49ddc17c240b1022f07278354a072e62bd7e5..1c061e251eaf2c07092c202d3c418100d9b5e3c4 100644 (file)
--- 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],
   '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
   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],
   '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'),
   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,
     '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'),
   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 77120937c512c11b1c52194f975ea4a473d07c21..74739c0da5151903d90d9874ed9009efb2ae4c84 100644 (file)
--- 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 <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"
 
 #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 7e9ae1ab4c4c2798004ffdbeac6881a37dee8adc..4e15e626eed972a67915a554fa5d30b2732cf52a 100644 (file)
--- a/src/intel/vulkan/anv_formats.c
+++ b/src/intel/vulkan/anv_formats.c
@@ -22,7 +22,7 @@
  */
 
 #include "anv_private.h"
  */
 
 #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"
 #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 3999c7399d04d36461c48b2678cc5ea49174f186..facf7d18006a4201822af66a61b5ed0b8be56911 100644 (file)
--- 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 <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"
 
 #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 5fb7c71da40b3fddc0300d7409cc98140aa61362..60da96a134eb4d002926aa8bf912850ac8e689e1 100644 (file)
--- 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 <pthread.h>
 #include <assert.h>
 #include <stdint.h>

-#include <i915_drm.h>
+#include "drm-uapi/i915_drm.h"

 
 #ifdef HAVE_VALGRIND
 #include <valgrind.h>
 
 #ifdef HAVE_VALGRIND
 #include <valgrind.h>

diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
index ffd1985f251c3145ae2c5b83fc26562ad2ca4621..7fa43a6ad791f1a19b10a6f8243354e133bdc7f1 100644 (file)
--- 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 : [
     '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 : [
       inc_vulkan_wsi,
     ],
     c_args : [


@@ -183,7 +183,7 @@ libanv_common = static_library(
     gen_xml_pack,
   ],
   include_directories : [
     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,
     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 : [
   '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],
     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 : [
     '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,
       inc_vulkan_wsi,
     ],
     link_whole : libanv_common,

diff --git a/src/loader/Makefile.am b/src/loader/Makefile.am
index 3c22e0ae7e60593491e794468e87ba58d26bba1c..fbefdaee5dacba970c46cba352a74ea27154b58c 100644 (file)
--- 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 \
        -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) \
        -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 7d61c1df4fca41ca646a9eba5d03b528ebdf4dac..7ef59f0477be02251e0a36fb3797eaac13867257 100644 (file)
--- 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 "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
 
 /* 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 e280ba41cc2b43780d39aa03d470f5c102506f76..69c81688bf4156ee17e71f95bbbbd49eca951a5a 100644 (file)
--- 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,
     '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,
     ],
     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 6e22f5125b956f8384b6e978b2c15ed7a2fe9580..9fa4174eefc3c82b4c6d5ef98582df4242958590 100644 (file)
--- 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"
 #define INTEL_BUFFERS_H
 
 #include "dri_util.h"

-#include "drm.h"
+#include "drm-uapi/drm.h"

 #include "intel_context.h"
 
 struct intel_context;
 #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 b79288d29bc769b5967e22ddf72557d8827a6fc6..6613356010ac578d711725f1613bbf35e825b885 100644 (file)
--- 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 "main/mtypes.h"
 #include "main/errors.h"
 

-#include <drm.h>
+#include "drm-uapi/drm.h"

 #include <intel_bufmgr.h>
 #include <intel_bufmgr.h>

-#include <i915_drm.h>
+#include "drm-uapi/i915_drm.h"

 
 #include "intel_screen.h"
 #include "intel_tex_obj.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 79f2113a468806763fd0a0af53c96d32a32a8004..f3aa4f2715515fa3342ff9a29a998df48469fd68 100644 (file)
--- 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 "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.
 
 /**
  * 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 359cf31347548571be395dde67ba772f284b7228..80f6df41aac3a753016b420fd89f0bbc9b984aff 100644 (file)
--- 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 <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
 #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 1574c8834c9681f5d0cc6977568523ea9139f856..b9ce93f7a978bbfd936ad99582e781f33b2d7107 100644 (file)
--- 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 \
 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)
 
 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,,) \
 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)
 
 LOCAL_SRC_FILES := \
        $(i965_FILES)

diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index 0bda2897e8e6e171b1fdd9de58ee003a79d002fb..d7d7db208da15627138e60f87f3f8c2e1bf8105c 100644 (file)
--- 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)/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) \
        $(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 f1675b191c1003883f90ddd2d29cf2a043ad9237..b33a30930db447a2e389bd77bd5869f4042990c7 100644 (file)
--- 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 "brw_context.h"
 #include "string.h"
 

-#include "i915_drm.h"
+#include "drm-uapi/i915_drm.h"

 
 #ifdef HAVE_VALGRIND
 #include <valgrind.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 10e3d024f171b1587c67233104c999a31d426c11..786569d227fe24d638f0a0dc273e65a6c2469781 100644 (file)
--- 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 <sys/ioctl.h>
 
 #include <xf86drm.h>

-#include <i915_drm.h>
+#include "drm-uapi/i915_drm.h"

 
 #include "main/hash.h"
 #include "main/macros.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 7e3988c96b0a9a376ad32738a555e8fc52d48ec7..0377c677c4c2b4edd0a16f35654d8b0b074509dc 100644 (file)
--- 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 "util/hash_table.h"
 
 #include <xf86drm.h>

-#include <i915_drm.h>
+#include "drm-uapi/i915_drm.h"

 
 #define FILE_DEBUG_FLAG DEBUG_BUFMGR
 
 
 #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 0e0d9c31f2b36807513773df90acbe0a520f3d5e..b5ab49f801364dcbc49564c704fb3210759748eb 100644 (file)
--- 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"
 #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);
 #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 b4e3524aa51f1adda4046d523f8ce279796fcf67..fe77d72fae4f8ab736c7653629acebd769221403 100644 (file)
--- 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 <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"
 
 #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 ece4ce0e334c09d7283fc48d7918998eee7b6668..7f6b69713c184dbbf461907e1d9bd4eb6c07d635 100644 (file)
--- 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.
  */
 
  * 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>
 #include <errno.h>
 #include <time.h>
 #include <unistd.h>


@@ -111,7 +111,7 @@ DRI_CONF_END
 
 #include "brw_context.h"
 
 
 #include "brw_context.h"
 

-#include "i915_drm.h"
+#include "drm-uapi/i915_drm.h"

 
 /**
  * For debugging purposes, this returns a time in seconds.
 
 /**
  * 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 8d56fcd9e7a864543d36b424564372d565341c05..2a21d4e19eee5e3b45f6e7bddadc7ad8ec94f5fb 100644 (file)
--- 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 "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"
 #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 cd3683ae7ec4024474c13614ecbbf0db626e1539..ea63af9cc4b6e6100b699c5d1237f2e09ad7dc1a 100644 (file)
--- 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 : [
   [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],
   ],
   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 f9ba6835e804d1230a0c70b609e4dbc652430ec3..8ac39f1c5754a5a0c40c0c837d5eb005ebbbfa18 100644 (file)
--- 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"
 #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"
 
 #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 42feec76e653a09c9aa733d4676f8d19a5bb277c..d3cb1eae8f810aea37255fb595f3040a9188ec66 100644 (file)
--- 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 "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);
 #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 94917cf30b6ffb35824508695327dafd6e1f64eb..21f6034db6cf52fe55c7de2a1731daa1387a5050 100644 (file)
--- 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 "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"
 #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 dc7e32aaa68fd2e1a3c96204973e18ad558362d5..cc738d5c9a54af184c1b7042c5ba8bf382f426b3 100644 (file)
--- 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 \
 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 \
        -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 e9812b663e44dc82b896bdca9fb144d02aece084..41e9c27ce8d29f21cdb8327ef6f6e1f0a97ed60e 100644 (file)
--- 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,
 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,
   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 e5dc1bb4c745c956bfb8eb337ad31b1a83a0f806..783b954a5c5bbddcf5804a356f214c23eafd79f7 100644 (file)
--- a/src/vulkan/wsi/wsi_common.c
+++ b/src/vulkan/wsi/wsi_common.c
@@ -22,7 +22,7 @@
  */
 
 #include "wsi_common_private.h"
  */
 
 #include "wsi_common_private.h"

-#include "drm_fourcc.h"
+#include "drm-uapi/drm_fourcc.h"

 #include "util/macros.h"
 #include "vk_util.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 08e9e5fe3fce0bde4242e131235473062b212773..7ff9d77d88bba76ccfcc00e2148ff24c64f0ee3b 100644 (file)
--- 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 <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>
 #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 1bdae7307ac5923fe0c0a9dc8331b3bcda72c750..fac343040442e8ce682e683b8f47a1d614ff3713 100644 (file)
--- 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 <string.h>
 #include <pthread.h>
 

-#include <drm_fourcc.h>
+#include "drm-uapi/drm_fourcc.h"

 
 #include "vk_util.h"
 #include "wsi_common_private.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 3604fe467862c55740c60043fc7b5cc0f903c4bd..52d820869a8614a08861803fe1114e4d711525a4 100644 (file)
--- 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 <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"
 #include "util/hash_table.h"
 
 #include "vk_util.h"