OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm-uapi: use local files, not system libdrm

Browse Source 
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>
This commit is contained in:
Eric Engestrom
2019-02-12 18:18:03 +00:00
committed by Eric Engestrom
parent 69e4c273c4
commit f1374805a8
95 changed files with 103 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/meson.build
View File

@@ -18,7 +18,6 @@
# 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')

2
src/egl/Android.mk
View File

@@ -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

1
src/egl/Makefile.am
View File

@@ -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 \

1
src/egl/SConscript
View File

@@ -8,7 +8,6 @@ env = env.Clone()
env.Append(CPPPATH = [
'#/include',
'#/include/drm-uapi',
'#/include/HaikuGL',
'#/src/egl/main',
'#/src',

2
src/egl/drivers/dri2/egl_dri2.c
View File

@@ -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>

2
src/egl/drivers/dri2/platform_wayland.c
View File

@@ -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"

2
src/egl/meson.build
View File

@@ -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',

2
src/freedreno/drm/msm_drm.h
View File

@@ -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" {

2
src/gallium/drivers/etnaviv/etnaviv_resource.c
View File

@@ -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)

2
src/gallium/drivers/etnaviv/etnaviv_screen.c
View File

@@ -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)

2
src/gallium/drivers/etnaviv/etnaviv_texture.c
View File

@@ -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,

2
src/gallium/drivers/etnaviv/etnaviv_texture_state.c
View File

@@ -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,

2
src/gallium/drivers/etnaviv/etnaviv_transfer.c
View File

@@ -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

2
src/gallium/drivers/freedreno/Android.mk
View File

@@ -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)

2
src/gallium/drivers/freedreno/Makefile.am
View File

@@ -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 \

2
src/gallium/drivers/freedreno/freedreno_resource.c
View File

@@ -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' */

2
src/gallium/drivers/freedreno/freedreno_screen.c
View File

@@ -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>

2
src/gallium/drivers/nouveau/Android.mk
View File

@@ -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

2
src/gallium/drivers/nouveau/Makefile.am
View File

@@ -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)

2
src/gallium/drivers/nouveau/meson.build
View File

@@ -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],

2
src/gallium/drivers/nouveau/nouveau_winsys.h
View File

@@ -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

2
src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c
View File

@@ -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"

2
src/gallium/drivers/nouveau/nvc0/nvc0_resource.c
View File

@@ -1,4 +1,4 @@
#include <drm_fourcc.h>
#include "drm-uapi/drm_fourcc.h"
#include "pipe/p_context.h"
#include "nvc0/nvc0_resource.h"

1
src/gallium/drivers/panfrost/meson.build
View File

@@ -46,7 +46,6 @@ inc_panfrost = [
inc_common,
inc_gallium,
inc_gallium_aux,
inc_drm_uapi,
inc_include,
inc_src,
include_directories('include'),

2
src/gallium/drivers/panfrost/pan_resource.c
View File

@@ -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"

2
src/gallium/drivers/panfrost/pan_resource.h
View File

@@ -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 */

2
src/gallium/drivers/panfrost/pan_screen.c
View File

@@ -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"

2
src/gallium/drivers/tegra/Makefile.am
View File

@@ -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

2
src/gallium/drivers/tegra/meson.build
View File

@@ -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,
],
)

4
src/gallium/drivers/tegra/tegra_screen.c
View File

@@ -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"

2
src/gallium/drivers/v3d/Makefile.am
View File

@@ -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 \

4
src/gallium/drivers/v3d/meson.build
View File

@@ -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],

2
src/gallium/drivers/v3d/v3d_context.h
View File

@@ -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"

2
src/gallium/drivers/v3d/v3d_resource.c
View File

@@ -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"

2
src/gallium/drivers/vc4/Android.mk
View File

@@ -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 := \

2
src/gallium/drivers/vc4/Makefile.am
View File

@@ -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 \

2
src/gallium/drivers/vc4/meson.build
View File

@@ -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],

2
src/gallium/drivers/vc4/vc4_context.h
View File

@@ -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"

4
src/gallium/drivers/vc4/vc4_resource.c
View File

@@ -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"

4
src/gallium/drivers/vc4/vc4_screen.c
View File

@@ -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"

2
src/gallium/state_trackers/dri/dri2.c
View File

@@ -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

2
src/gallium/state_trackers/va/surface.c
View File

@@ -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,

2
src/gallium/targets/d3dadapter9/drm.c
View File

@@ -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>

2
src/gallium/winsys/i915/drm/i915_drm_batchbuffer.c
View File

@@ -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>

2
src/gallium/winsys/i915/drm/i915_drm_buffer.c
View File

@@ -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)
{

2
src/gallium/winsys/i915/drm/i915_drm_winsys.c
View File

@@ -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"

2
src/gallium/winsys/i915/drm/i915_drm_winsys.h
View File

@@ -4,7 +4,7 @@
#include "i915/i915_batchbuffer.h"
#include "drm.h"
#include "drm-uapi/drm.h"
#include "intel_bufmgr.h"

2
src/gallium/winsys/svga/drm/vmwgfx_drm.h
View File

@@ -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

2
src/gallium/winsys/virgl/drm/virtgpu_drm.h
View File

@@ -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.

2
src/gbm/backends/dri/gbm_dri.c
View File

@@ -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>

2
src/intel/Android.dev.mk
View File

@@ -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)

1
src/intel/Android.vulkan.mk
View File

@@ -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

1
src/intel/Makefile.am
View File

@@ -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 \

2
src/intel/Makefile.vulkan.am
View File

@@ -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 \

2
src/intel/common/gen_defines.h
View File

@@ -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" {

2
src/intel/dev/gen_device_info.c
View File

@@ -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.

2
src/intel/dev/meson.build
View File

@@ -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],
)

4
src/intel/isl/isl_drm.c
View File

@@ -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"

6
src/intel/isl/meson.build
View File

@@ -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],
)

2
src/intel/tools/aub_write.c
View File

@@ -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"

2
src/intel/tools/error2aub.c
View File

@@ -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)))

2
src/intel/tools/intel_dump_gpu.c
View File

@@ -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"

2
src/intel/tools/intel_sanitize_gpu.c
View File

@@ -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"

6
src/intel/tools/meson.build
View File

@@ -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'),

2
src/intel/vulkan/anv_device.c
View File

@@ -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"

2
src/intel/vulkan/anv_formats.c
View File

@@ -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"

2
src/intel/vulkan/anv_image.c
View File

@@ -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"

2
src/intel/vulkan/anv_private.h
View File

@@ -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>

8
src/intel/vulkan/meson.build
View File

@@ -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,

1
src/loader/Makefile.am
View File

@@ -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) \

2
src/loader/loader_dri3_helper.c
View File

@@ -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

2
src/loader/meson.build
View File

@@ -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,
],

2
src/mesa/drivers/dri/i915/intel_buffers.h
View File

@@ -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;

4
src/mesa/drivers/dri/i915/intel_context.h
View File

@@ -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"

2
src/mesa/drivers/dri/i915/intel_screen.c
View File

@@ -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.

2
src/mesa/drivers/dri/i915/intel_screen.h
View File

@@ -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

4
src/mesa/drivers/dri/i965/Android.mk
View File

@@ -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)

2
src/mesa/drivers/dri/i965/Makefile.am
View File

@@ -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) \

2
src/mesa/drivers/dri/i965/brw_bufmgr.c
View File

@@ -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>

2
src/mesa/drivers/dri/i965/brw_performance_query.c
View File

@@ -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"

2
src/mesa/drivers/dri/i965/intel_batchbuffer.c
View File

@@ -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

2
src/mesa/drivers/dri/i965/intel_buffers.h
View File

@@ -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);

2
src/mesa/drivers/dri/i965/intel_mipmap_tree.c
View File

@@ -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"

4
src/mesa/drivers/dri/i965/intel_screen.c
View File

@@ -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.

2
src/mesa/drivers/dri/i965/intel_screen.h
View File

@@ -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"

2
src/mesa/drivers/dri/i965/meson.build
View File

@@ -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],

2
src/mesa/drivers/dri/r200/r200_context.h
View File

@@ -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"

2
src/mesa/drivers/dri/r200/r200_ioctl.h
View File

@@ -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);

2
src/mesa/drivers/dri/radeon/radeon_context.h
View File

@@ -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"

1
src/vulkan/Makefile.am
View File

@@ -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 \

2
src/vulkan/wsi/meson.build
View File

@@ -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,

2
src/vulkan/wsi/wsi_common.c
View File

@@ -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"

2
src/vulkan/wsi/wsi_common_display.c
View File

@@ -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>

2
src/vulkan/wsi/wsi_common_wayland.c
View File

@@ -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"

2
src/vulkan/wsi/wsi_common_x11.c
View File

@@ -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"