[waffle] [PATCH 2/8] android: move droid_destroy_surface() further up the file

Emil Velikov emil.l.velikov at gmail.com
Tue Apr 5 22:52:19 UTC 2016


Analogous to previous commit, minus the case where the setup (wrongly)
open-codes it.

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/waffle/android/droid_surfaceflingerlink.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/waffle/android/droid_surfaceflingerlink.cpp b/src/waffle/android/droid_surfaceflingerlink.cpp
index 75803f3..a0251c1 100644
--- a/src/waffle/android/droid_surfaceflingerlink.cpp
+++ b/src/waffle/android/droid_surfaceflingerlink.cpp
@@ -100,6 +100,17 @@ error:
     return NULL;
 }
 
+void
+droid_destroy_surface(
+    droid_surfaceflinger_container* pSFContainer,
+    droid_ANativeWindow_container* pANWContainer)
+{
+    pSFContainer->composer_client->openGlobalTransaction();
+    pANWContainer->surface_control->clear();
+    pSFContainer->composer_client->closeGlobalTransaction();
+    delete pANWContainer;
+}
+
 droid_ANativeWindow_container*
 droid_setup_surface(
     int width,
@@ -225,17 +236,6 @@ droid_resize_surface(
     return true;
 }
 
-void
-droid_destroy_surface(
-    droid_surfaceflinger_container* pSFContainer,
-    droid_ANativeWindow_container* pANWContainer)
-{
-    pSFContainer->composer_client->openGlobalTransaction();
-    pANWContainer->surface_control->clear();
-    pSFContainer->composer_client->closeGlobalTransaction();
-    delete pANWContainer;
-}
-
 }; // namespace waffle
 
 extern "C" struct droid_surfaceflinger_container*
-- 
2.8.0



More information about the waffle mailing list