From 5f699e314d65f5a5bee473baee9d17a4fa60fe60 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 2 May 2018 09:33:52 -0300 Subject: mesa: Upgrade 17.3.8 -> 18.0.2 This includes changes from Mesa 18.0.0 and 18.0.2 releases. Mesa 18.0.0 is a new development release and 18.0.1 and 18.0.2 are bug-fix releases. You can find release notes here: - https://mesa3d.org/relnotes/18.0.0.html - https://mesa3d.org/relnotes/18.0.1.html - https://mesa3d.org/relnotes/18.0.2.html Remove patch 0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch that was applied on upstream. (From OE-Core rev: c16bc7c9b1526ff4b9496af00ada08aa4109c0ef) Signed-off-by: Otavio Salvador Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...i-Initialise-modifier-to-INVALID-for-DRI2.patch | 43 ---------------------- meta/recipes-graphics/mesa/mesa-gl_17.3.8.bb | 9 ----- meta/recipes-graphics/mesa/mesa-gl_18.0.2.bb | 9 +++++ meta/recipes-graphics/mesa/mesa_17.3.8.bb | 23 ------------ meta/recipes-graphics/mesa/mesa_18.0.2.bb | 22 +++++++++++ 5 files changed, 31 insertions(+), 75 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/files/0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_17.3.8.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_18.0.2.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_17.3.8.bb create mode 100644 meta/recipes-graphics/mesa/mesa_18.0.2.bb (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/mesa/files/0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch b/meta/recipes-graphics/mesa/files/0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch deleted file mode 100644 index 6aba7859ee..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 4cbecb61682a0ee426faaa03d824fc8fd7aef826 Mon Sep 17 00:00:00 2001 -From: Daniel Stone -Date: Mon, 2 Apr 2018 13:20:34 +0100 -Subject: [PATCH] st/dri: Initialise modifier to INVALID for DRI2 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When allocating a buffer for DRI2, set the modifier to INVALID to inform -the backend that we have no supplied modifiers and it should do its own -thing. The missed initialisation forced linear, even if the -implementation had made other decisions. - -This resulted in VC4 DRI2 clients failing with: - Modifier 0x0 vs. tiling (0x700000000000001) mismatch - -Signed-off-by: Daniel Stone -Reported-by: Andreas Müller -Reviewed-by: Eric Anholt -Fixes: 3f8513172ff6 ("gallium/winsys/drm: introduce modifier field to winsys_handle") - -Upstream-Status: Backport [1] - -[1] https://cgit.freedesktop.org/mesa/mesa/commit/?id=4cbecb61682a0ee426faaa03d824fc8fd7aef826 ---- - src/gallium/state_trackers/dri/dri2.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c -index 31d17d46c2..58a6757f03 100644 ---- a/src/gallium/state_trackers/dri/dri2.c -+++ b/src/gallium/state_trackers/dri/dri2.c -@@ -806,6 +806,7 @@ dri2_allocate_textures(struct dri_context *ctx, - whandle.handle = buf->name; - whandle.stride = buf->pitch; - whandle.offset = 0; -+ whandle.modifier = DRM_FORMAT_MOD_INVALID; - if (screen->can_share_buffer) - whandle.type = DRM_API_HANDLE_TYPE_SHARED; - else --- -2.14.3 - diff --git a/meta/recipes-graphics/mesa/mesa-gl_17.3.8.bb b/meta/recipes-graphics/mesa/mesa-gl_17.3.8.bb deleted file mode 100644 index 73267eb4f0..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_17.3.8.bb +++ /dev/null @@ -1,9 +0,0 @@ -require mesa_${PV}.bb - -SUMMARY += " (OpenGL only, no EGL/GLES)" - -PROVIDES = "virtual/libgl virtual/mesa" - -S = "${WORKDIR}/mesa-${PV}" - -PACKAGECONFIG ??= "opengl dri ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" diff --git a/meta/recipes-graphics/mesa/mesa-gl_18.0.2.bb b/meta/recipes-graphics/mesa/mesa-gl_18.0.2.bb new file mode 100644 index 0000000000..73267eb4f0 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_18.0.2.bb @@ -0,0 +1,9 @@ +require mesa_${PV}.bb + +SUMMARY += " (OpenGL only, no EGL/GLES)" + +PROVIDES = "virtual/libgl virtual/mesa" + +S = "${WORKDIR}/mesa-${PV}" + +PACKAGECONFIG ??= "opengl dri ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" diff --git a/meta/recipes-graphics/mesa/mesa_17.3.8.bb b/meta/recipes-graphics/mesa/mesa_17.3.8.bb deleted file mode 100644 index 2d3fd3ca38..0000000000 --- a/meta/recipes-graphics/mesa/mesa_17.3.8.bb +++ /dev/null @@ -1,23 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ - file://disable-asm-on-non-gcc.patch \ - file://Use-Python-3-to-execute-the-scripts.patch \ - file://0001-Use-wayland-scanner-in-the-path.patch \ - file://0002-hardware-gloat.patch \ - file://llvm-config-version.patch \ - file://0001-winsys-svga-drm-Include-sys-types.h.patch \ - file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \ - file://0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch \ - " - -SRC_URI[md5sum] = "203d1a79156ab6926f2d253b377e9d9d" -SRC_URI[sha256sum] = "8f9d9bf281c48e4a8f5228816577263b4c655248dc7666e75034ab422951a6b1" - -#because we cannot rely on the fact that all apps will use pkgconfig, -#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER -do_install_append() { - if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then - sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h - fi -} diff --git a/meta/recipes-graphics/mesa/mesa_18.0.2.bb b/meta/recipes-graphics/mesa/mesa_18.0.2.bb new file mode 100644 index 0000000000..aaac1e58e1 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_18.0.2.bb @@ -0,0 +1,22 @@ +require ${BPN}.inc + +SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ + file://disable-asm-on-non-gcc.patch \ + file://Use-Python-3-to-execute-the-scripts.patch \ + file://0001-Use-wayland-scanner-in-the-path.patch \ + file://0002-hardware-gloat.patch \ + file://llvm-config-version.patch \ + file://0001-winsys-svga-drm-Include-sys-types.h.patch \ + file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \ + " + +SRC_URI[md5sum] = "3c303da98ec2ce37c795baeba5aee31e" +SRC_URI[sha256sum] = "98fa159768482dc568b9f8bf0f36c7acb823fa47428ffd650b40784f16b9e7b3" + +#because we cannot rely on the fact that all apps will use pkgconfig, +#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER +do_install_append() { + if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then + sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h + fi +} -- cgit v1.2.3-54-g00ecf