Soft revert of cd7a1e2 (flutter#32465)

nt4f04uNd · Apr 7, 2022 · bcdadab · bcdadab
1 parent e5ceb46
commit bcdadab
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/shell/common/context_options.cc b/shell/common/context_options.cc
@@ -19,6 +19,12 @@ GrContextOptions MakeDefaultContextOptions(ContextType type,
   options.fPersistentCache = PersistentCache::GetCacheForProcess();
 
   if (api.has_value() && api.value() == GrBackendApi::kOpenGL) {
+    // Using stencil buffers has caused memory and performance regressions.
+    // See b/226484927 for internal customer regressions doc.
+    // Before enabling, we need to show a motivating case for where it will
+    // improve performance on OpenGL backend.
+    options.fAvoidStencilBuffers = true;
+
     // To get video playback on the widest range of devices, we limit Skia to
     // ES2 shading language when the ES3 external image extension is missing.
     options.fPreferExternalImagesOverES3 = true;

diff --git a/shell/common/context_options_unittests.cc b/shell/common/context_options_unittests.cc
@@ -9,10 +9,10 @@
 namespace flutter {
 namespace testing {
 
-TEST(ContextOptionsTest, OpenGLAllowsStencilBuffers) {
+TEST(ContextOptionsTest, OpenGLDisablesStencilBuffers) {
   auto options = MakeDefaultContextOptions(flutter::ContextType::kRender,
                                            GrBackendApi::kOpenGL);
-  EXPECT_FALSE(options.fAvoidStencilBuffers);
+  EXPECT_TRUE(options.fAvoidStencilBuffers);
 }
 
 }  // namespace testing

diff --git a/shell/gpu/gpu_surface_gl.cc b/shell/gpu/gpu_surface_gl.cc
@@ -139,7 +139,7 @@ static sk_sp<SkSurface> WrapOnscreenSurface(GrDirectContext* context,
   GrBackendRenderTarget render_target(size.width(),     // width
                                       size.height(),    // height
                                       0,                // sample count
-                                      8,                // stencil bits
+                                      0,                // stencil bits
                                       framebuffer_info  // framebuffer info
   );
 

diff --git a/shell/platform/android/android_context_gl.cc b/shell/platform/android/android_context_gl.cc
@@ -85,7 +85,7 @@ static EGLResult<EGLConfig> ChooseEGLConfiguration(EGLDisplay display,
       EGL_BLUE_SIZE,       8,
       EGL_ALPHA_SIZE,      8,
       EGL_DEPTH_SIZE,      0,
-      EGL_STENCIL_SIZE,    8,
+      EGL_STENCIL_SIZE,    0,
       EGL_SAMPLES,         static_cast<EGLint>(msaa_samples),
       EGL_SAMPLE_BUFFERS,  sample_buffers,
       EGL_NONE,            // termination sentinel

diff --git a/shell/platform/embedder/embedder.cc b/shell/platform/embedder/embedder.cc
@@ -621,7 +621,7 @@ static sk_sp<SkSurface> MakeSkSurfaceFromBackingStore(
       config.size.width,   // width
       config.size.height,  // height
       1,                   // sample count
-      8,                   // stencil bits
+      0,                   // stencil bits
       framebuffer_info     // framebuffer info
   );