From 4ba478d7cdf8b20c2fb8368321f42dd33a388587 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 16 Jul 2018 15:57:24 -0700 Subject: [PATCH] egl: Use the canonical drm-uapi fourcc header to avoid local defines. We should only use a #define locally once it's been upstreamed, and at that point you should just update our drm_fourcc.h. Reviewed-by: Jason Ekstrand --- src/egl/Android.mk | 1 + src/egl/Makefile.am | 1 + src/egl/SConscript | 1 + src/egl/drivers/dri2/egl_dri2.c | 28 ------------------------- src/egl/drivers/dri2/platform_wayland.c | 8 ------- src/egl/meson.build | 2 +- 6 files changed, 4 insertions(+), 37 deletions(-) diff --git a/src/egl/Android.mk b/src/egl/Android.mk index 8412aeb7984..11128ded93c 100644 --- a/src/egl/Android.mk +++ b/src/egl/Android.mk @@ -44,6 +44,7 @@ LOCAL_CFLAGS := \ -DHAVE_ANDROID_PLATFORM LOCAL_C_INCLUDES := \ + $(MESA_TOP)/include/drm-uapi \ $(MESA_TOP)/src/egl/main \ $(MESA_TOP)/src/egl/drivers/dri2 diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am index 1a2273b8c31..b43805d991a 100644 --- a/src/egl/Makefile.am +++ b/src/egl/Makefile.am @@ -27,6 +27,7 @@ BUILT_SOURCES = AM_CFLAGS = \ -I$(top_srcdir)/include \ + -I$(top_srcdir)/include/drm-uapi \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/egl/main \ -I$(top_srcdir)/src/gbm/main \ diff --git a/src/egl/SConscript b/src/egl/SConscript index 927092d2284..153fdc08923 100644 --- a/src/egl/SConscript +++ b/src/egl/SConscript @@ -8,6 +8,7 @@ env = env.Clone() env.Append(CPPPATH = [ '#/include', + '#/include/drm-uapi', '#/include/HaikuGL', '#/src/egl/main', '#/src', diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 45d0c7275c5..63679566c1e 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -65,34 +65,6 @@ #include "util/u_vector.h" #include "mapi/glapi/glapi.h" -/* The kernel header drm_fourcc.h defines the DRM formats below. We duplicate - * some of the definitions here so that building Mesa won't bleeding-edge - * kernel headers. - */ -#ifndef DRM_FORMAT_R8 -#define DRM_FORMAT_R8 fourcc_code('R', '8', ' ', ' ') /* [7:0] R */ -#endif - -#ifndef DRM_FORMAT_RG88 -#define DRM_FORMAT_RG88 fourcc_code('R', 'G', '8', '8') /* [15:0] R:G 8:8 little endian */ -#endif - -#ifndef DRM_FORMAT_GR88 -#define DRM_FORMAT_GR88 fourcc_code('G', 'R', '8', '8') /* [15:0] G:R 8:8 little endian */ -#endif - -#ifndef DRM_FORMAT_R16 -#define DRM_FORMAT_R16 fourcc_code('R', '1', '6', ' ') /* [15:0] R 16 little endian */ -#endif - -#ifndef DRM_FORMAT_GR1616 -#define DRM_FORMAT_GR1616 fourcc_code('G', 'R', '3', '2') /* [31:0] R:G 16:16 little endian */ -#endif - -#ifndef DRM_FORMAT_MOD_INVALID -#define DRM_FORMAT_MOD_INVALID ((1ULL<<56) - 1) -#endif - #define NUM_ATTRIBS 12 static void diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c index 11026f9fbf4..294a6eddd60 100644 --- a/src/egl/drivers/dri2/platform_wayland.c +++ b/src/egl/drivers/dri2/platform_wayland.c @@ -50,14 +50,6 @@ #include "wayland-drm-client-protocol.h" #include "linux-dmabuf-unstable-v1-client-protocol.h" -#ifndef DRM_FORMAT_MOD_INVALID -#define DRM_FORMAT_MOD_INVALID ((1ULL << 56) - 1) -#endif - -#ifndef DRM_FORMAT_MOD_LINEAR -#define DRM_FORMAT_MOD_LINEAR 0 -#endif - /* * The index of entries in this table is used as a bitmask in * dri2_dpy->formats, which tracks the formats supported by our server. diff --git a/src/egl/meson.build b/src/egl/meson.build index 5f30bbba89a..89a84fd8908 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -24,7 +24,7 @@ inc_egl_dri2 = include_directories('drivers/dri2') c_args_for_egl = [] link_for_egl = [] deps_for_egl = [] -incs_for_egl = [inc_include, inc_src, inc_egl] +incs_for_egl = [inc_include, inc_drm_uapi, inc_src, inc_egl] files_egl = files( 'main/eglapi.c', -- 2.30.2