| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From 9c74ec83e2929b1d5ab65d5137b6ba42edeb332d Mon Sep 17 00:00:00 2001 |
| 2 | From: Yong Gan <b45748@freescale.com> |
| 3 | Date: Tue, 27 Oct 2015 18:15:20 +0800 |
| 4 | Subject: [PATCH] Fix: wl_surface should be destoryed after the wl_window |
| 5 | destroyed. |
| 6 | |
| 7 | Upstream-Status: Submitted [https://github.com/glmark2/glmark2/issues/12] |
| 8 | |
| 9 | Signed-off-by: Yong Gan <b45748@freescale.com> |
| 10 | |
| 11 | --- |
| 12 | src/native-state-wayland.cpp | 4 ++-- |
| 13 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 14 | |
| 15 | diff --git a/src/native-state-wayland.cpp b/src/native-state-wayland.cpp |
| 16 | index 41fc743..cdcdf34 100644 |
| 17 | --- a/src/native-state-wayland.cpp |
| 18 | +++ b/src/native-state-wayland.cpp |
| 19 | @@ -56,10 +56,10 @@ NativeStateWayland::~NativeStateWayland() |
| 20 | wl_shell_surface_destroy(window_->shell_surface); |
| 21 | if (window_->opaque_reqion) |
| 22 | wl_region_destroy(window_->opaque_reqion); |
| 23 | - if (window_->surface) |
| 24 | - wl_surface_destroy(window_->surface); |
| 25 | if (window_->native) |
| 26 | wl_egl_window_destroy(window_->native); |
| 27 | + if (window_->surface) |
| 28 | + wl_surface_destroy(window_->surface); |
| 29 | delete window_; |
| 30 | } |
| 31 | |
| 32 | -- |
| 33 | 1.9.1 |
| 34 | |