mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

glmark2: wl_surface should be destoryed after destroying wl_window

Browse Source 
If wl_surface is destroyed while work thread is still running,
segmentation fault occurs.

Signed-off-by: Neena Busireddy <neenareddy.busireddy@nxp.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Neena Busireddy
2016-05-02 14:22:34 -05:00
committed by Martin Jansa
parent f4ee5549c3
commit c7265a61d7
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-benchmark/glmark2/files/0001-Fix-wl_surface-should-be-destoryed-after-the-wl_wind.patch
+34
View File
@@ -0,0 +1,34 @@
From 9c74ec83e2929b1d5ab65d5137b6ba42edeb332d Mon Sep 17 00:00:00 2001
From: Yong Gan <b45748@freescale.com>
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 <b45748@freescale.com>
---
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
meta-oe/recipes-benchmark/glmark2/glmark2_git.bb
+2 -1
View File
@@ -13,7 +13,8 @@ DEPENDS = "libpng12 jpeg"
PV = "2014.03+${SRCPV}"
SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https \
file://build-Check-packages-to-be-used-by-the-enabled-flavo.patch"
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"
SRCREV = "fa71af2dfab711fac87b9504b6fc9862f44bf72a"
S = "${WORKDIR}/git"