Rework BOARD_EGL_NEEDS_LEGACY_FB implementation

The problem with the window format boils down to a circular dependency that makes service startup hang, so skip a round of queues-to-window-composer to avoid it but keep using regular Surface objects as windows, instead of replacing them with native windows. Change-Id: I6fed0fe04928df370c298c68ac1eb6d5b5cfb214
AOKP · Aug 15, 2013 · bf3c0b5 · bf3c0b5
1 parent bb37e5e
commit bf3c0b5
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 17 deletions.
diff --git a/include/gui/Surface.h b/include/gui/Surface.h
@@ -252,6 +252,10 @@ class Surface
 
     // must be accessed from lock/unlock thread only
     Region mDirtyRegion;
+
+#ifdef BOARD_EGL_NEEDS_LEGACY_FB
+    bool                        mDequeuedOnce;
+#endif
 };
 
 }; // namespace android

diff --git a/libs/gui/Android.mk b/libs/gui/Android.mk
@@ -43,6 +43,10 @@ ifeq ($(TARGET_USES_QCOM_BSP),true)
     LOCAL_CFLAGS += -DQCOM_BSP
 endif
 
+ifeq ($(BOARD_EGL_NEEDS_LEGACY_FB),true)
+    LOCAL_CFLAGS += -DBOARD_EGL_NEEDS_LEGACY_FB
+endif
+
 LOCAL_MODULE:= libgui
 
 ifeq ($(TARGET_BOARD_PLATFORM), tegra)

diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp
@@ -72,6 +72,9 @@ Surface::Surface(
     mTransformHint = 0;
     mConsumerRunningBehind = false;
     mConnectedToCpu = false;
+#ifdef BOARD_EGL_NEEDS_LEGACY_FB
+    mDequeuedOnce = false;
+#endif
 }
 
 Surface::~Surface() {
@@ -218,6 +221,9 @@ int Surface::dequeueBuffer(android_native_buffer_t** buffer,
     }
 
     *buffer = gbuf.get();
+#ifdef BOARD_EGL_NEEDS_LEGACY_FB
+    if (!mDequeuedOnce) mDequeuedOnce = true;
+#endif
     return OK;
 }
 
@@ -306,12 +312,19 @@ int Surface::query(int what, int* value) const {
                 }
                 break;
             case NATIVE_WINDOW_QUEUES_TO_WINDOW_COMPOSER: {
-                sp<ISurfaceComposer> composer(
-                        ComposerService::getComposerService());
-                if (composer->authenticateSurfaceTexture(mGraphicBufferProducer)) {
-                    *value = 1;
-                } else {
+#ifdef BOARD_EGL_NEEDS_LEGACY_FB
+                if (!mDequeuedOnce) {
                     *value = 0;
+                } else
+#endif
+                {
+                    sp<ISurfaceComposer> composer(
+                            ComposerService::getComposerService());
+                    if (composer->authenticateSurfaceTexture(mGraphicBufferProducer)) {
+                        *value = 1;
+                    } else {
+                        *value = 0;
+                    }
                 }
                 return NO_ERROR;
             }

diff --git a/services/surfaceflinger/Android.mk b/services/surfaceflinger/Android.mk
@@ -34,10 +34,6 @@ ifeq ($(TARGET_DISABLE_TRIPLE_BUFFERING),true)
 	LOCAL_CFLAGS += -DTARGET_DISABLE_TRIPLE_BUFFERING
 endif
 
-ifeq ($(BOARD_EGL_NEEDS_LEGACY_FB),true)
-	LOCAL_CFLAGS += -DBOARD_EGL_NEEDS_LEGACY_FB
-endif
-
 ifneq ($(NUM_FRAMEBUFFER_SURFACE_BUFFERS),)
   LOCAL_CFLAGS += -DNUM_FRAMEBUFFER_SURFACE_BUFFERS=$(NUM_FRAMEBUFFER_SURFACE_BUFFERS)
 endif

diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp
@@ -29,10 +29,6 @@
 
 #include <gui/Surface.h>
 
-#ifdef BOARD_EGL_NEEDS_LEGACY_FB
-#include <ui/FramebufferNativeWindow.h>
-#endif
-
 #include <GLES/gl.h>
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
@@ -96,11 +92,7 @@ DisplayDevice::DisplayDevice(
       mOrientation()
 {
     mNativeWindow = new Surface(mDisplaySurface->getIGraphicBufferProducer());
-#ifndef BOARD_EGL_NEEDS_LEGACY_FB
     ANativeWindow* const window = mNativeWindow.get();
-#else
-    ANativeWindow* const window = new FramebufferNativeWindow();
-#endif
 
     int format;
     window->query(window, NATIVE_WINDOW_FORMAT, &format);