Fix clear rect tracking on begin GL access

Previous patch did not update GLTextureRepresentation's clear region
on begin access. This allowed it to get out of sync if other (non-GL)
components modified the clear rect.

This patch updates the cleared rect on each begin access.

Bug: 1039232
Change-Id: Iacc6e65b25d770e1d17e51a5f1c2c632dfad0101
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1990195Reviewed-by: Khushal <khushalsagar@chromium.org>
Reviewed-by: Tommi <tommi@chromium.org>
Commit-Queue: Eric Karl <ericrk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#729950}

content/browser/webrtc/webrtc_capture_from_element_browsertest.cc

@@ -104,13 +104,6 @@ IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest,
 
 IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest,
                        VerifyCanvasCaptureWebGLFrames) {
-#if defined(OS_ANDROID)
-  // TODO(ericrk): fails on Pixel 2 Skia Renderer Vulkan after shared image
-  // changes. See https://crbug.com/1039232
-  if (base::SysInfo::HardwareModelName() == "Pixel 2") {
-    return;
-  }
-#endif
   MakeTypicalCall("testCanvasCapture(drawWebGL);", kCanvasCaptureTestHtmlFile);
 }
 

content/test/gpu/gpu_tests/test_expectations/pixel_expectations.txt

@@ -71,10 +71,6 @@ crbug.com/992599 [ android android-webview-instrumentation ] Pixel_OffscreenCanv
 # Produces black images on Nexus 5Xs in Android Webview (qualcomm-adreno-(tm)-418) crbug.com/984352
 # Fails on Pixel 2 (qualcomm-adreno-(tm)-540) crbug.com/966069
 crbug.com/805739 [ android ] Pixel_CanvasLowLatency2D [ Skip ]
-crbug.com/1039232 [ android android-chromium qualcomm-adreno-(tm)-540 use-vulkan skia-renderer ] Pixel_CanvasLowLatencyWebGL [ Failure ]
-crbug.com/1039232 [ android android-chromium qualcomm-adreno-(tm)-540 use-vulkan skia-renderer ] Pixel_OffscreenCanvasWebGLPaintAfterResize [ Failure ]
-crbug.com/1039232 [ android android-chromium qualcomm-adreno-(tm)-540 use-vulkan skia-renderer ] Pixel_OffscreenCanvasWebGLDefaultWorker [ Failure ]
-crbug.com/1039232 [ android android-chromium qualcomm-adreno-(tm)-540 use-vulkan skia-renderer ] Pixel_RepeatedWebGLTo2D [ Failure ]
 
 # Skip test that kills GPU process since Android Webview only supports
 # in-process GPU.

gpu/command_buffer/service/shared_image_backing_factory_ahardwarebuffer.cc

@@ -681,15 +681,10 @@ gles2::Texture* SharedImageBackingAHB::GenGLTexture() {
   texture->sampler_state_.wrap_t = GL_CLAMP_TO_EDGE;
   texture->sampler_state_.wrap_s = GL_CLAMP_TO_EDGE;
 
-  // If the backing is already cleared, no need to clear it again.
-  gfx::Rect cleared_rect;
-  if (IsCleared())
-    cleared_rect = gfx::Rect(size());
-
   texture->SetLevelInfo(target, 0, egl_image->GetInternalFormat(),
                         size().width(), size().height(), 1, 0,
                         egl_image->GetDataFormat(), egl_image->GetDataType(),
-                        cleared_rect);
+                        ClearedRect());
   texture->SetLevelImage(target, 0, egl_image.get(), gles2::Texture::BOUND);
   texture->SetImmutable(true, false);
   api->glBindTextureFn(target, old_texture_binding);
@@ -887,7 +882,6 @@ std::unique_ptr<SharedImageBacking> SharedImageBackingFactoryAHB::MakeBacking(
     AHardwareBuffer_Desc hwb_info;
     base::AndroidHardwareBufferCompat::GetInstance().Describe(buffer,
                                                               &hwb_info);
-
     void* address = nullptr;
     if (int error = base::AndroidHardwareBufferCompat::GetInstance().Lock(
             buffer, AHARDWAREBUFFER_USAGE_CPU_WRITE_RARELY, -1, 0, &address)) {

gpu/command_buffer/service/shared_image_representation.cc

@@ -34,6 +34,8 @@ SharedImageRepresentationGLTextureBase::BeginScopedAccess(
   if (!BeginAccess(mode))
     return nullptr;
 
+  UpdateClearedStateOnBeginAccess();
+
   constexpr GLenum kReadAccess = 0x8AF6;
   if (mode == kReadAccess)
     backing()->OnReadSucceeded();
@@ -61,6 +63,15 @@ void SharedImageRepresentationGLTexture::UpdateClearedStateOnEndAccess() {
     SetClearedRect(cleared_rect);
 }
 
+void SharedImageRepresentationGLTexture::UpdateClearedStateOnBeginAccess() {
+  auto* texture = GetTexture();
+  // Operations outside of the gles2::Texture may have cleared or uncleared it.
+  // Make sure this state is reflected back in gles2::Texture.
+  gfx::Rect cleared_rect = ClearedRect();
+  if (cleared_rect != texture->GetLevelClearedRect(texture->target(), 0))
+    texture->SetLevelClearedRect(texture->target(), 0, cleared_rect);
+}
+
 gpu::TextureBase*
 SharedImageRepresentationGLTexturePassthrough::GetTextureBase() {
   return GetTexturePassthrough().get();

gpu/command_buffer/service/shared_image_representation.h

@@ -136,7 +136,9 @@ class GPU_GLES2_EXPORT SharedImageRepresentationGLTextureBase
  protected:
   friend class SharedImageRepresentationSkiaGL;
 
-  // Can be overridden to handle clear state tracking when GL access ends.
+  // Can be overridden to handle clear state tracking when GL access begins or
+  // ends.
+  virtual void UpdateClearedStateOnBeginAccess() {}
   virtual void UpdateClearedStateOnEndAccess() {}
 
   // TODO(ericrk): Make these pure virtual and ensure real implementations
@@ -159,6 +161,7 @@ class GPU_GLES2_EXPORT SharedImageRepresentationGLTexture
   gpu::TextureBase* GetTextureBase() override;
 
  protected:
+  void UpdateClearedStateOnBeginAccess() override;
   void UpdateClearedStateOnEndAccess() override;
 };
 

gpu/command_buffer/service/shared_image_representation_unittest.cc

@@ -74,13 +74,26 @@ TEST_F(SharedImageRepresentationTest, GLTextureClearing) {
   }
   EXPECT_TRUE(representation->IsCleared());
 
-  // We can now begin accdess with |allow_uncleared| == false.
+  // We can now begin access with |allow_uncleared| == false.
   {
     auto scoped_access = representation->BeginScopedAccess(
         GL_SHARED_IMAGE_ACCESS_MODE_READWRITE_CHROMIUM,
         SharedImageRepresentation::AllowUnclearedAccess::kNo);
     EXPECT_TRUE(scoped_access);
   }
+
+  // Reset the representation to uncleared. This should unclear the texture on
+  // BeginAccess.
+  representation->SetClearedRect(gfx::Rect());
+  {
+    auto scoped_access = representation->BeginScopedAccess(
+        GL_SHARED_IMAGE_ACCESS_MODE_READWRITE_CHROMIUM,
+        SharedImageRepresentation::AllowUnclearedAccess::kYes);
+    ASSERT_TRUE(scoped_access);
+    EXPECT_FALSE(
+        representation->GetTexture()->IsLevelCleared(GL_TEXTURE_2D, 0));
+  }
+  EXPECT_FALSE(representation->IsCleared());
 }
 
 TEST_F(SharedImageRepresentationTest, GLTexturePassthroughClearing) {