This includes following changes: 9fa385e GLStateEGL: Use eglGetPlatformDisplayEXT when possible ac983d7 wayland: Don't store the opaque region unnecessarily 5fcdba1 wayland: Fix destruction order of surface-related objects bf766f8 SceneTerrain: Add missing header file for std::abs
Signed-off-by: Otavio Salvador <[email protected]> --- ...ace-should-be-destoryed-after-the-wl_wind.patch | 34 ---------------------- meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | 3 +- 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 meta-oe/recipes-benchmark/glmark2/files/0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch diff --git a/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch b/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch deleted file mode 100644 index 439508102..000000000 --- a/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9c74ec83e2929b1d5ab65d5137b6ba42edeb332d Mon Sep 17 00:00:00 2001 -From: Yong Gan <[email protected]> -Date: Tue, 27 Oct 2015 18:15:20 +0800 -Subject: [PATCH] Fix: wl_surface should be destoryed after the wl_window - destroyed. - -Upstream-Status: Submitted [https://github.com/glmark2/glmark2/issues/12] - -Signed-off-by: Yong Gan <[email protected]> - ---- - src/native-state-wayland.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/native-state-wayland.cpp b/src/native-state-wayland.cpp -index 41fc743..cdcdf34 100644 ---- a/src/native-state-wayland.cpp -+++ b/src/native-state-wayland.cpp -@@ -56,10 +56,10 @@ NativeStateWayland::~NativeStateWayland() - wl_shell_surface_destroy(window_->shell_surface); - if (window_->opaque_reqion) - wl_region_destroy(window_->opaque_reqion); -- if (window_->surface) -- wl_surface_destroy(window_->surface); - if (window_->native) - wl_egl_window_destroy(window_->native); -+ if (window_->surface) -+ wl_surface_destroy(window_->surface); - delete window_; - } - --- -1.9.1 - diff --git a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 85d7bf16e..5d05c47cd 100644 --- a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -16,10 +16,9 @@ COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https \ file://build-Check-packages-to-be-used-by-the-enabled-flavo.patch \ - file://0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch \ file://Fix-configure-for-sqrt-check.patch \ " -SRCREV = "9b1070fe9c5cf908f323909d3c8cbed08022abe8" +SRCREV = "9fa385e86950d18c5ca1f64ca5fc323348a336fa" S = "${WORKDIR}/git" -- 2.13.2 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
