aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-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
17 files changed, 20 insertions, 20 deletions
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"
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 19:54:04 +0000