Avoid EGLImage target texture reuse on PowerVR

This workarounds a memory corruption bug in PowerVR drivers
that cause memory corruption. The bug happens when
EGLImageTargetTexture2DOES is called on an already
defined texture object.

Workaround is to always create a new texture id each time.
This only works if there are no other code saving the
old texture id, and only AsyncPixelTransferDelegateIdle
needed to be updated to not do this.

BUG=480992

Review URL: https://codereview.chromium.org/1105153003

Cr-Commit-Position: refs/heads/master@{#327425}

gpu/command_buffer/service/async_pixel_transfer_manager_idle.cc

@@ -32,9 +32,10 @@ class AsyncPixelTransferDelegateIdle
     : public AsyncPixelTransferDelegate,
       public base::SupportsWeakPtr<AsyncPixelTransferDelegateIdle> {
  public:
+  typedef base::Callback<GLuint()> TextureIdCallback;
   AsyncPixelTransferDelegateIdle(
       AsyncPixelTransferManagerIdle::SharedState* state,
-      GLuint texture_id,
+      const TextureIdCallback& texture_id_callback,
       const AsyncTexImage2DParams& define_params);
   ~AsyncPixelTransferDelegateIdle() override;
 
@@ -55,7 +56,7 @@ class AsyncPixelTransferDelegateIdle
                                  AsyncMemoryParams mem_params);
 
   uint64 id_;
-  GLuint texture_id_;
+  TextureIdCallback texture_id_callback_;
   bool transfer_in_progress_;
   AsyncTexImage2DParams define_params_;
 
@@ -68,10 +69,10 @@ class AsyncPixelTransferDelegateIdle
 
 AsyncPixelTransferDelegateIdle::AsyncPixelTransferDelegateIdle(
     AsyncPixelTransferManagerIdle::SharedState* shared_state,
-    GLuint texture_id,
+    const TextureIdCallback& texture_id_callback,
     const AsyncTexImage2DParams& define_params)
     : id_(g_next_pixel_transfer_state_id++),
-      texture_id_(texture_id),
+      texture_id_callback_(texture_id_callback),
       transfer_in_progress_(false),
       define_params_(define_params),
       shared_state_(shared_state) {}
@@ -145,7 +146,8 @@ void AsyncPixelTransferDelegateIdle::PerformAsyncTexImage2D(
   void* data = mem_params.GetDataAddress();
 
   base::TimeTicks begin_time(base::TimeTicks::Now());
-  gfx::ScopedTextureBinder texture_binder(tex_params.target, texture_id_);
+  gfx::ScopedTextureBinder texture_binder(tex_params.target,
+                                          texture_id_callback_.Run());
 
   {
     TRACE_EVENT0("gpu", "glTexImage2D");
@@ -181,7 +183,8 @@ void AsyncPixelTransferDelegateIdle::PerformAsyncTexSubImage2D(
   void* data = mem_params.GetDataAddress();
 
   base::TimeTicks begin_time(base::TimeTicks::Now());
-  gfx::ScopedTextureBinder texture_binder(tex_params.target, texture_id_);
+  gfx::ScopedTextureBinder texture_binder(tex_params.target,
+                                          texture_id_callback_.Run());
 
   if (shared_state_->use_teximage2d_over_texsubimage2d &&
       tex_params.xoffset == 0 &&
@@ -317,9 +320,15 @@ AsyncPixelTransferDelegate*
 AsyncPixelTransferManagerIdle::CreatePixelTransferDelegateImpl(
     gles2::TextureRef* ref,
     const AsyncTexImage2DParams& define_params) {
-  return new AsyncPixelTransferDelegateIdle(&shared_state_,
-                                            ref->service_id(),
-                                            define_params);
+  return new AsyncPixelTransferDelegateIdle(
+      &shared_state_,
+      // Not directly passing texture_ref->service_id here because it can change
+      // if avoid_egl_image_target_texture_reuse workaround is in effect.
+      // Unretained is safe because AsyncPixelTransferManager observes
+      // TextureRef destruction and destroys the delegate before TextureRef
+      // is destroyed.
+      base::Bind(&gles2::TextureRef::service_id, base::Unretained(ref)),
+      define_params);
 }
 
 }  // namespace gpu

gpu/command_buffer/service/feature_info.cc

@@ -14,6 +14,7 @@
 #include "base/strings/string_util.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
+#include "gpu/command_buffer/service/texture_definition.h"
 #include "gpu/config/gpu_switches.h"
 #include "ui/gl/gl_fence.h"
 #include "ui/gl/gl_implementation.h"
@@ -1100,6 +1101,10 @@ void FeatureInfo::InitializeFeatures() {
   }
 #endif
 
+  if (workarounds_.avoid_egl_image_target_texture_reuse) {
+    TextureDefinition::AvoidEGLTargetTextureReuse();
+  }
+
   if (gl_version_info_->IsLowerThanGL(4, 3)) {
     // crbug.com/481184.
     // GL_PRIMITIVE_RESTART_FIXED_INDEX is only available on Desktop GL 4.3+,

gpu/command_buffer/service/texture_definition.cc

@@ -243,6 +243,8 @@ class NativeImageBufferStub : public NativeImageBuffer {
   DISALLOW_COPY_AND_ASSIGN(NativeImageBufferStub);
 };
 
+bool g_avoid_egl_target_texture_reuse = false;
+
 }  // anonymous namespace
 
 // static
@@ -260,6 +262,11 @@ scoped_refptr<NativeImageBuffer> NativeImageBuffer::Create(GLuint texture_id) {
   }
 }
 
+// static
+void TextureDefinition::AvoidEGLTargetTextureReuse() {
+  g_avoid_egl_target_texture_reuse = true;
+}
+
 TextureDefinition::LevelInfo::LevelInfo()
     : target(0),
       internal_format(0),
@@ -347,12 +354,12 @@ Texture* TextureDefinition::CreateTexture() const {
   glGenTextures(1, &texture_id);
 
   Texture* texture(new Texture(texture_id));
-  UpdateTexture(texture);
+  UpdateTextureInternal(texture);
 
   return texture;
 }
 
-void TextureDefinition::UpdateTexture(Texture* texture) const {
+void TextureDefinition::UpdateTextureInternal(Texture* texture) const {
   gfx::ScopedTextureBinder texture_binder(target_, texture->service_id());
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter_);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter_);
@@ -397,6 +404,22 @@ void TextureDefinition::UpdateTexture(Texture* texture) const {
   texture->usage_ = usage_;
 }
 
+void TextureDefinition::UpdateTexture(Texture* texture) const {
+  GLuint old_service_id = 0u;
+  if (image_buffer_.get() && g_avoid_egl_target_texture_reuse) {
+    GLuint service_id = 0u;
+    glGenTextures(1, &service_id);
+    old_service_id = texture->service_id();
+    texture->SetServiceId(service_id);
+  }
+
+  UpdateTextureInternal(texture);
+
+  if (old_service_id) {
+    glDeleteTextures(1, &old_service_id);
+  }
+}
+
 bool TextureDefinition::Matches(const Texture* texture) const {
   DCHECK(target_ == texture->target());
   if (texture->min_filter_ != min_filter_ ||

gpu/command_buffer/service/texture_definition.h

@@ -40,6 +40,8 @@ class NativeImageBuffer : public base::RefCountedThreadSafe<NativeImageBuffer> {
 // the underlying image buffer(s).
 class TextureDefinition {
  public:
+  static void AvoidEGLTargetTextureReuse();
+
   TextureDefinition();
   TextureDefinition(Texture* texture,
                     unsigned int version,
@@ -59,6 +61,7 @@ class TextureDefinition {
 
  private:
   bool SafeToRenderFrom() const;
+  void UpdateTextureInternal(Texture* texture) const;
 
   struct LevelInfo {
     LevelInfo();

gpu/config/gpu_driver_bug_list_json.cc

@@ -19,7 +19,7 @@ const char kGpuDriverBugListJson[] = LONG_STRING_CONST(
 {
   "name": "gpu driver bug list",
   // Please update the version number whenever you change this file.
-  "version": "7.23",
+  "version": "7.24",
   "entries": [
     {
       "id": 1,
@@ -1232,7 +1232,7 @@ LONG_STRING_CONST(
     },
     {
       "id": 107,
-      "description": "EGL Sync server wait broken on IMG G6xxx drivers",
+      "description": "Workaround IMG PowerVR G6xxx drivers bugs",
       "cr_bugs": [480992],
       "os": {
         "type": "android",
@@ -1250,6 +1250,7 @@ LONG_STRING_CONST(
         "value2": "1.4"
       },
       "features": [
+        "avoid_egl_image_target_texture_reuse",
         "disable_egl_khr_wait_sync"
       ]
     }

gpu/config/gpu_driver_bug_workaround_type.h

@@ -10,6 +10,8 @@
 #include "gpu/gpu_export.h"
 
 #define GPU_DRIVER_BUG_WORKAROUNDS(GPU_OP)                   \
+  GPU_OP(AVOID_EGL_IMAGE_TARGET_TEXTURE_REUSE,               \
+         avoid_egl_image_target_texture_reuse)               \
   GPU_OP(CLEAR_ALPHA_IN_READPIXELS,                          \
          clear_alpha_in_readpixels)                          \
   GPU_OP(CLEAR_UNIFORMS_BEFORE_FIRST_PROGRAM_USE,            \