Fix CHROMIUM_texture_storage_image detection

Whether or not CHROMIUM_texture_storage_image is supported depends
entirely on the underlying ImageFactory.

Add a function to query if the ImageFactory has the capability to create
anonymous images, and use this to enable relevant parts of FeatureInfo.
Remove the ifdef that was being used to determine whether or not to
enable CHROMIUM_texture_storage_image, because that was just attempting
to match the capabilities of the ImageFactory (and sometimes failing).

I screwed this up in the previous patch because I was checking for
gpu_memory_manager, thinking that it was gpu_memory_buffer_manager.
As it happens CHROMIUM_gpu_memory_manager is unused, so just remove
it.

Bug: 845213, 849478
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I9d97749863c61954151e9f06dc23949613c2181f
Reviewed-on: https://chromium-review.googlesource.com/1088313Reviewed-by: ccameron <ccameron@chromium.org>
Reviewed-by: Sunny Sachanandani <sunnyps@chromium.org>
Commit-Queue: ccameron <ccameron@chromium.org>
Cr-Commit-Position: refs/heads/master@{#565140}

cc/test/test_image_factory.cc

@@ -33,14 +33,4 @@ scoped_refptr<gl::GLImage> TestImageFactory::CreateImageForGpuMemoryBuffer(
   return image;
 }
 
-scoped_refptr<gl::GLImage> TestImageFactory::CreateAnonymousImage(
-    const gfx::Size& size,
-    gfx::BufferFormat format,
-    gfx::BufferUsage usage,
-    unsigned internalformat,
-    bool* is_cleared) {
-  NOTREACHED();
-  return nullptr;
-}
-
 }  // namespace cc

cc/test/test_image_factory.h

@@ -23,11 +23,6 @@ class TestImageFactory : public gpu::ImageFactory {
       unsigned internalformat,
       int client_id,
       gpu::SurfaceHandle surface_handle) override;
-  scoped_refptr<gl::GLImage> CreateAnonymousImage(const gfx::Size& size,
-                                                  gfx::BufferFormat format,
-                                                  gfx::BufferUsage usage,
-                                                  unsigned internalformat,
-                                                  bool* is_cleared) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestImageFactory);

gpu/command_buffer/service/feature_info.cc

@@ -320,6 +320,13 @@ bool IsGL_REDSupportedOnFBOs() {
   return result;
 }
 
+void FeatureInfo::EnableCHROMIUMTextureStorageImage() {
+  if (!feature_flags_.chromium_texture_storage_image) {
+    feature_flags_.chromium_texture_storage_image = true;
+    AddExtensionString("GL_CHROMIUM_texture_storage_image");
+  }
+}
+
 void FeatureInfo::EnableEXTColorBufferFloat() {
   if (!ext_color_buffer_float_available_)
     return;
@@ -457,16 +464,6 @@ void FeatureInfo::InitializeFeatures() {
   // so the extension string is always exposed.
   AddExtensionString("GL_OES_vertex_array_object");
 
-  if (!disallowed_features_.gpu_memory_manager) {
-// Texture storage image is only usable with native gpu memory buffer support.
-#if defined(OS_MACOSX) || (defined(OS_LINUX) && defined(USE_OZONE))
-    feature_flags_.chromium_texture_storage_image = true;
-    AddExtensionString("GL_CHROMIUM_texture_storage_image");
-#endif
-
-    AddExtensionString("GL_CHROMIUM_gpu_memory_manager");
-  }
-
   if (gl::HasExtension(extensions, "GL_ANGLE_translated_shader_source")) {
     feature_flags_.angle_translated_shader_source = true;
   }

gpu/command_buffer/service/feature_info.h

@@ -181,6 +181,7 @@ class GPU_GLES2_EXPORT FeatureInfo : public base::RefCounted<FeatureInfo> {
   bool IsWebGL1OrES2Context() const;
   bool IsWebGL2OrES3Context() const;
 
+  void EnableCHROMIUMTextureStorageImage();
   void EnableCHROMIUMColorBufferFloatRGBA();
   void EnableCHROMIUMColorBufferFloatRGB();
   void EnableEXTColorBufferFloat();

gpu/command_buffer/service/gles2_cmd_decoder.cc

@@ -2985,6 +2985,11 @@ GLenum BackTexture::Target() {
 bool BackTexture::AllocateNativeGpuMemoryBuffer(const gfx::Size& size,
                                                 GLenum format,
                                                 bool zero) {
+  if (!decoder_->GetContextGroup()
+           ->image_factory()
+           ->SupportsCreateAnonymousImage())
+    return false;
+
   DCHECK(format == GL_RGB || format == GL_RGBA);
   bool is_cleared = false;
   scoped_refptr<gl::GLImage> image =
@@ -3407,6 +3412,12 @@ gpu::ContextResult GLES2DecoderImpl::Initialize(
     }
   }
 
+  // Support for CHROMIUM_texture_storage_image depends on the underlying
+  // ImageFactory's ability to create anonymous images.
+  gpu::ImageFactory* image_factory = group_->image_factory();
+  if (image_factory && image_factory->SupportsCreateAnonymousImage())
+    feature_info_->EnableCHROMIUMTextureStorageImage();
+
   // In theory |needs_emulation| needs to be true on Desktop GL 4.1 or lower.
   // However, we set it to true everywhere, not to trust drivers to handle
   // out-of-bounds buffer accesses.

gpu/command_buffer/service/gles2_cmd_decoder.h

@@ -64,7 +64,6 @@ struct DisallowedFeatures {
     oes_texture_half_float_linear = false;
   }
 
-  bool gpu_memory_manager = false;
   bool npot_support = false;
   bool chromium_color_buffer_float_rgba = false;
   bool chromium_color_buffer_float_rgb = false;

gpu/command_buffer/service/image_factory.cc

@@ -12,6 +12,10 @@ ImageFactory::ImageFactory() = default;
 
 ImageFactory::~ImageFactory() = default;
 
+bool ImageFactory::SupportsCreateAnonymousImage() const {
+  return false;
+}
+
 scoped_refptr<gl::GLImage> ImageFactory::CreateAnonymousImage(
     const gfx::Size& size,
     gfx::BufferFormat format,

gpu/command_buffer/service/image_factory.h

@@ -34,6 +34,7 @@ class GPU_EXPORT ImageFactory {
 
   // Create an anonymous GLImage backed by a GpuMemoryBuffer that doesn't have a
   // client_id. It can't be passed to other processes.
+  virtual bool SupportsCreateAnonymousImage() const;
   virtual scoped_refptr<gl::GLImage> CreateAnonymousImage(
       const gfx::Size& size,
       gfx::BufferFormat format,

gpu/command_buffer/tests/texture_image_factory.cc

@@ -61,6 +61,10 @@ scoped_refptr<gl::GLImage> TextureImageFactory::CreateImageForGpuMemoryBuffer(
   return nullptr;
 }
 
+bool TextureImageFactory::SupportsCreateAnonymousImage() const {
+  return true;
+}
+
 scoped_refptr<gl::GLImage> TextureImageFactory::CreateAnonymousImage(
     const gfx::Size& size,
     gfx::BufferFormat format,

gpu/command_buffer/tests/texture_image_factory.h

@@ -20,6 +20,7 @@ class TextureImageFactory : public gpu::ImageFactory {
       unsigned internalformat,
       int client_id,
       SurfaceHandle surface_handle) override;
+  bool SupportsCreateAnonymousImage() const override;
   scoped_refptr<gl::GLImage> CreateAnonymousImage(const gfx::Size& size,
                                                   gfx::BufferFormat format,
                                                   gfx::BufferUsage usage,

gpu/ipc/in_process_command_buffer.cc

@@ -510,7 +510,6 @@ gpu::ContextResult InProcessCommandBuffer::InitializeOnGpuThread(
   }
 
   gles2::DisallowedFeatures disallowed_features;
-  disallowed_features.gpu_memory_manager = true;
   auto result = decoder_->Initialize(surface_, context_, params.is_offscreen,
                                      disallowed_features, params.attribs);
   if (result != gpu::ContextResult::kSuccess) {

gpu/ipc/service/gpu_memory_buffer_factory_android_hardware_buffer.cc

@@ -72,17 +72,6 @@ GpuMemoryBufferFactoryAndroidHardwareBuffer::CreateImageForGpuMemoryBuffer(
   return image;
 }
 
-scoped_refptr<gl::GLImage>
-GpuMemoryBufferFactoryAndroidHardwareBuffer::CreateAnonymousImage(
-    const gfx::Size& size,
-    gfx::BufferFormat format,
-    gfx::BufferUsage usage,
-    unsigned internalformat,
-    bool* is_cleared) {
-  NOTIMPLEMENTED();
-  return nullptr;
-}
-
 unsigned GpuMemoryBufferFactoryAndroidHardwareBuffer::RequiredTextureType() {
   return GL_TEXTURE_EXTERNAL_OES;
 }

gpu/ipc/service/gpu_memory_buffer_factory_android_hardware_buffer.h

@@ -42,11 +42,6 @@ class GPU_IPC_SERVICE_EXPORT GpuMemoryBufferFactoryAndroidHardwareBuffer
       unsigned internalformat,
       int client_id,
       SurfaceHandle surface_handle) override;
-  scoped_refptr<gl::GLImage> CreateAnonymousImage(const gfx::Size& size,
-                                                  gfx::BufferFormat format,
-                                                  gfx::BufferUsage usage,
-                                                  unsigned internalformat,
-                                                  bool* is_cleared) override;
   unsigned RequiredTextureType() override;
 
  private:

gpu/ipc/service/gpu_memory_buffer_factory_dxgi.cc

@@ -116,16 +116,6 @@ GpuMemoryBufferFactoryDXGI::CreateImageForGpuMemoryBuffer(
   return image;
 }
 
-scoped_refptr<gl::GLImage> GpuMemoryBufferFactoryDXGI::CreateAnonymousImage(
-    const gfx::Size& size,
-    gfx::BufferFormat format,
-    gfx::BufferUsage usage,
-    unsigned internalformat,
-    bool* is_cleared) {
-  NOTIMPLEMENTED();
-  return nullptr;
-}
-
 unsigned GpuMemoryBufferFactoryDXGI::RequiredTextureType() {
   return GL_TEXTURE_2D;
 }

gpu/ipc/service/gpu_memory_buffer_factory_dxgi.h

@@ -53,11 +53,6 @@ class GPU_IPC_SERVICE_EXPORT GpuMemoryBufferFactoryDXGI
       unsigned internalformat,
       int client_id,
       SurfaceHandle surface_handle) override;
-  scoped_refptr<gl::GLImage> CreateAnonymousImage(const gfx::Size& size,
-                                                  gfx::BufferFormat format,
-                                                  gfx::BufferUsage usage,
-                                                  unsigned internalformat,
-                                                  bool* is_cleared) override;
   unsigned RequiredTextureType() override;
   bool SupportsFormatRGB() override;
 

gpu/ipc/service/gpu_memory_buffer_factory_io_surface.cc

@@ -99,6 +99,10 @@ ImageFactory* GpuMemoryBufferFactoryIOSurface::AsImageFactory() {
   return this;
 }
 
+bool GpuMemoryBufferFactoryIOSurface::SupportsCreateAnonymousImage() const {
+  return true;
+}
+
 scoped_refptr<gl::GLImage>
 GpuMemoryBufferFactoryIOSurface::CreateImageForGpuMemoryBuffer(
     const gfx::GpuMemoryBufferHandle& handle,

gpu/ipc/service/gpu_memory_buffer_factory_io_surface.h

@@ -54,6 +54,7 @@ class GPU_IPC_SERVICE_EXPORT GpuMemoryBufferFactoryIOSurface
       unsigned internalformat,
       int client_id,
       SurfaceHandle surface_handle) override;
+  bool SupportsCreateAnonymousImage() const override;
   scoped_refptr<gl::GLImage> CreateAnonymousImage(const gfx::Size& size,
                                                   gfx::BufferFormat format,
                                                   gfx::BufferUsage usage,

gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.cc

@@ -134,6 +134,14 @@ GpuMemoryBufferFactoryNativePixmap::CreateImageForGpuMemoryBuffer(
   return image;
 }
 
+bool GpuMemoryBufferFactoryNativePixmap::SupportsCreateAnonymousImage() const {
+#if defined(USE_OZONE)
+  return true;
+#else
+  return false;
+#endif
+}
+
 scoped_refptr<gl::GLImage>
 GpuMemoryBufferFactoryNativePixmap::CreateAnonymousImage(
     const gfx::Size& size,

gpu/ipc/service/gpu_memory_buffer_factory_native_pixmap.h

@@ -49,6 +49,7 @@ class GPU_IPC_SERVICE_EXPORT GpuMemoryBufferFactoryNativePixmap
       unsigned internalformat,
       int client_id,
       SurfaceHandle surface_handle) override;
+  bool SupportsCreateAnonymousImage() const override;
   scoped_refptr<gl::GLImage> CreateAnonymousImage(const gfx::Size& size,
                                                   gfx::BufferFormat format,
                                                   gfx::BufferUsage usage,