diff options
Diffstat (limited to 'common/recipes-graphics/mesa')
4 files changed, 80 insertions, 42 deletions
diff --git a/common/recipes-graphics/mesa/mesa/0001-configure.ac-adjust-usage-of-LLVM-flags.patch b/common/recipes-graphics/mesa/mesa/0001-configure.ac-adjust-usage-of-LLVM-flags.patch index a6599648..7338cf50 100644 --- a/common/recipes-graphics/mesa/mesa/0001-configure.ac-adjust-usage-of-LLVM-flags.patch +++ b/common/recipes-graphics/mesa/mesa/0001-configure.ac-adjust-usage-of-LLVM-flags.patch @@ -1,4 +1,4 @@ -From 223ffdb659ceb8628e38003495b5c6550833b673 Mon Sep 17 00:00:00 2001 +From 5f05454b30da807a02233e99373a37b7c863d5c3 Mon Sep 17 00:00:00 2001 From: Awais Belal <awais_belal@mentor.com> Date: Thu, 26 Jul 2018 17:13:32 +0500 Subject: [PATCH] configure.ac: adjust usage of LLVM flags @@ -8,15 +8,16 @@ so using flags from there creates conflicts between mesa and llvm on the target. Signed-off-by: Awais Belal <awais_belal@mentor.com> + --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index d1c8bb82da..290cc5f9f8 100644 +index f59b29f2d68..893d41f7094 100644 --- a/configure.ac +++ b/configure.ac -@@ -1064,6 +1064,7 @@ strip_unwanted_llvm_flags() { +@@ -1101,6 +1101,7 @@ strip_unwanted_llvm_flags() { -e 's/[[[:space:]]]+-pedantic[[[:space:]]]/ /g' \ -e 's/[[[:space:]]]+-W[[^[:space:]]]*//g' \ -e 's/[[[:space:]]]+-O[[^[:space:]]]*//g' \ @@ -24,7 +25,7 @@ index d1c8bb82da..290cc5f9f8 100644 -e 's/[[[:space:]]]+-g[[^[:space:]]]*//g' \ -e 's/-fno-rtti[[[:space:]]]/-Fno-rtti /g' \ -e 's/[[[:space:]]]+-f[[^[:space:]]]*//g' \ -@@ -2808,7 +2809,7 @@ dnl +@@ -2900,7 +2901,7 @@ dnl if test "x$enable_llvm" = xyes; then DEFINES="${DEFINES} -DHAVE_LLVM=0x0$LLVM_VERSION_INT -DMESA_LLVM_VERSION_PATCH=$LLVM_VERSION_PATCH" @@ -32,6 +33,4 @@ index d1c8bb82da..290cc5f9f8 100644 + LLVM_LDFLAGS= LLVM_CFLAGS=$LLVM_CPPFLAGS # CPPFLAGS seem to be sufficient LLVM_CXXFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cxxflags"` - --- -2.11.1 + LLVM_CXXFLAGS="$CXX11_CXXFLAGS $LLVM_CXXFLAGS" diff --git a/common/recipes-graphics/mesa/mesa/0001-gallium-add-missing-PIPE_CAP_SURFACE_SAMPLE_COUNT-de.patch b/common/recipes-graphics/mesa/mesa/0001-gallium-add-missing-PIPE_CAP_SURFACE_SAMPLE_COUNT-de.patch deleted file mode 100644 index d40aaa98..00000000 --- a/common/recipes-graphics/mesa/mesa/0001-gallium-add-missing-PIPE_CAP_SURFACE_SAMPLE_COUNT-de.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ad0ef93a61be1ccd00e3b48bf6913bc2bffb3143 Mon Sep 17 00:00:00 2001 -From: Samuel Pitoiset <samuel.pitoiset@gmail.com> -Date: Fri, 7 Dec 2018 10:08:38 +0100 -Subject: [PATCH] gallium: add missing PIPE_CAP_SURFACE_SAMPLE_COUNT default - value -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: 2710c40e3c8 ("gallium: Add new PIPE_CAP_SURFACE_SAMPLE_COUNT") -Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> -Tested-by: Michel Dänzer <michel.daenzer@amd.com> ---- - src/gallium/auxiliary/util/u_screen.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/gallium/auxiliary/util/u_screen.c b/src/gallium/auxiliary/util/u_screen.c -index 95d2a7d5701..6ca3992ecd1 100644 ---- a/src/gallium/auxiliary/util/u_screen.c -+++ b/src/gallium/auxiliary/util/u_screen.c -@@ -328,6 +328,9 @@ u_pipe_screen_get_param_defaults(struct pipe_screen *pscreen, - case PIPE_CAP_MAX_VERTEX_ELEMENT_SRC_OFFSET: - return 2047; - -+ case PIPE_CAP_SURFACE_SAMPLE_COUNT: -+ return 0; -+ - default: - unreachable("bad PIPE_CAP_*"); - } --- -2.11.1 - diff --git a/common/recipes-graphics/mesa/mesa/0001-vl-dri3-remove-the-wait-before-getting-back-buffer.patch b/common/recipes-graphics/mesa/mesa/0001-vl-dri3-remove-the-wait-before-getting-back-buffer.patch new file mode 100644 index 00000000..e487d420 --- /dev/null +++ b/common/recipes-graphics/mesa/mesa/0001-vl-dri3-remove-the-wait-before-getting-back-buffer.patch @@ -0,0 +1,72 @@ +From fa10114debafb2058789047704dbe2b21ce8df7e Mon Sep 17 00:00:00 2001 +From: Leo Liu <leo.liu@amd.com> +Date: Tue, 19 Mar 2019 13:37:39 -0400 +Subject: [PATCH] vl/dri3: remove the wait before getting back buffer +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The wait here is unnecessary since we got a pool of back buffers, +and the wait for swap buffer will happen before the present pixmap, +at the same time the previous back buffer will be put back to pool +for reuse after the check for PresentIdleNotify event + +Signed-off-by: Leo Liu <leo.liu@amd.com> +Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> +--- + src/gallium/auxiliary/vl/vl_winsys_dri3.c | 18 +++--------------- + 1 file changed, 3 insertions(+), 15 deletions(-) + +diff --git a/src/gallium/auxiliary/vl/vl_winsys_dri3.c b/src/gallium/auxiliary/vl/vl_winsys_dri3.c +index 152d28e59fc..1558d832555 100644 +--- a/src/gallium/auxiliary/vl/vl_winsys_dri3.c ++++ b/src/gallium/auxiliary/vl/vl_winsys_dri3.c +@@ -88,7 +88,6 @@ struct vl_dri3_screen + uint64_t send_sbc, recv_sbc; + int64_t last_ust, ns_frame, last_msc, next_msc; + +- bool flushed; + bool is_different_gpu; + }; + +@@ -570,11 +569,9 @@ vl_dri3_flush_frontbuffer(struct pipe_screen *screen, + if (!back) + return; + +- if (scrn->flushed) { +- while (scrn->special_event && scrn->recv_sbc < scrn->send_sbc) +- if (!dri3_wait_present_events(scrn)) +- return; +- } ++ while (scrn->special_event && scrn->recv_sbc < scrn->send_sbc) ++ if (!dri3_wait_present_events(scrn)) ++ return; + + rectangle.x = 0; + rectangle.y = 0; +@@ -610,8 +607,6 @@ vl_dri3_flush_frontbuffer(struct pipe_screen *screen, + + xcb_flush(scrn->conn); + +- scrn->flushed = true; +- + return; + } + +@@ -626,13 +621,6 @@ vl_dri3_screen_texture_from_drawable(struct vl_screen *vscreen, void *drawable) + if (!dri3_set_drawable(scrn, (Drawable)drawable)) + return NULL; + +- if (scrn->flushed) { +- while (scrn->special_event && scrn->recv_sbc < scrn->send_sbc) +- if (!dri3_wait_present_events(scrn)) +- return NULL; +- } +- scrn->flushed = false; +- + buffer = (scrn->is_pixmap) ? + dri3_get_front_buffer(scrn) : + dri3_get_back_buffer(scrn); +-- +2.17.1 + diff --git a/common/recipes-graphics/mesa/mesa_git.bb b/common/recipes-graphics/mesa/mesa_git.bb index 048ce06d..de2e8481 100644 --- a/common/recipes-graphics/mesa/mesa_git.bb +++ b/common/recipes-graphics/mesa/mesa_git.bb @@ -5,7 +5,7 @@ S = "${WORKDIR}/git" DEPENDS_append = " python-mako-native" inherit pythonnative -SRCREV_amd = "0144bbdb98f515cce31688fce57d769e7fd82d52" +SRCREV_amd = "d2c170eb355a912586cb982858faac2fc85c4783" LIC_FILES_CHKSUM_amd = "file://docs/license.html;md5=725f991a1cc322aa7a0cd3a2016621c4" PV_amd = "19.0.0+git${SRCPV}" @@ -27,7 +27,7 @@ RDEPENDS_mesa-megadriver += "${@bb.utils.contains('PACKAGECONFIG', 'va', '${LIBV SRC_URI_amd = "git://anongit.freedesktop.org/mesa/mesa;branch=master \ file://0001-configure.ac-obey-llvm_prefix-if-available.patch \ file://0001-configure.ac-adjust-usage-of-LLVM-flags.patch \ - file://0001-gallium-add-missing-PIPE_CAP_SURFACE_SAMPLE_COUNT-de.patch" + file://0001-vl-dri3-remove-the-wait-before-getting-back-buffer.patch" EXTRA_OECONF_append_amd = " \ --enable-vdpau \ |