Revert of Allow creating GLImage-backed textures with glTexStorage2D.

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
@@ skipping 2830 matching lines @@
               // BGRX format is preferred for Ozone as it matches the format
               // used by the buffer queue and is as a result guaranteed to work
               // on all devices.
               // TODO(reveman): Define this format in one place instead of
               // having to duplicate BGRX_8888.
               gfx::BufferFormat::BGRX_8888
 #else
               gfx::BufferFormat::RGBX_8888
 #endif
               : gfx::BufferFormat::RGBA_8888,
-          gfx::BufferUsage::SCANOUT, format);
+          format);
   if (!image || !image->BindTexImage(Target()))
     return false;
 
   image_ = image;
   decoder_->texture_manager()->SetLevelInfo(
       texture_ref_.get(), Target(), 0, image_->GetInternalFormat(),
       size.width(), size.height(), 1, 0, image_->GetInternalFormat(),
       GL_UNSIGNED_BYTE, gfx::Rect(size));
   decoder_->texture_manager()->SetLevelImage(texture_ref_.get(), Target(), 0,
                                              image_.get(), Texture::BOUND);
@@ skipping 1010 matching lines @@
   caps.disable_webgl_rgb_multisampling_usage =
       workarounds().disable_webgl_rgb_multisampling_usage;
   caps.software_to_accelerated_canvas_upgrade =
       !workarounds().disable_software_to_accelerated_canvas_upgrade;
   caps.emulate_rgb_buffer_with_rgba =
       workarounds().disable_gl_rgb_format;
   if (workarounds().disable_non_empty_post_sub_buffers_for_onscreen_surfaces &&
       !surface_->IsOffscreen()) {
     caps.disable_non_empty_post_sub_buffers = true;
   }
-  caps.texture_buffer_chromium =
-      feature_info_->feature_flags().chromium_texture_buffer;
 
   return caps;
 }
 
 void GLES2DecoderImpl::UpdateCapabilities() {
   util_.set_num_compressed_texture_formats(
       validators_->compressed_texture_format.GetValues().size());
   util_.set_num_shader_binary_formats(
       validators_->shader_binary_format.GetValues().size());
 }
@@ skipping 7083 matching lines @@
         iparams[0] = texture->swizzle_b();
       }
       return;
     case GL_TEXTURE_SWIZZLE_A:
       if (fparams) {
         fparams[0] = static_cast<GLfloat>(texture->swizzle_a());
       } else {
         iparams[0] = texture->swizzle_a();
       }
       return;
-    case GL_TEXTURE_BUFFER_USAGE_CHROMIUM:
-      if (fparams) {
-        fparams[0] = static_cast<GLfloat>(texture->buffer_usage());
-      } else {
-        iparams[0] = texture->buffer_usage();
-      }
-      return;
     default:
       break;
   }
   if (fparams) {
     glGetTexParameterfv(target, pname, fparams);
   } else {
     glGetTexParameteriv(target, pname, iparams);
   }
 }
 
@@ skipping 6559 matching lines @@
   Texture* texture = texture_ref->texture();
   if (texture->IsAttachedToFramebuffer()) {
     framebuffer_state_.clear_state_dirty = true;
   }
   if (texture->IsImmutable()) {
     LOCAL_SET_GL_ERROR(
         GL_INVALID_OPERATION, function_name, "texture is immutable");
     return;
   }
 
-  if (texture->buffer_usage() != GL_NONE) {
-    ScopedGLErrorSuppressor suppressor("GLES2CmdDecoder::TexStorageImpl",
-                                       state_.GetErrorState());
-    gfx::Size size(width, height);
-    gfx::BufferFormat buffer_format;
-    GLint real_internal_format;
-    switch (internal_format) {
-      case GL_RGBA8_OES:
-        buffer_format = gfx::BufferFormat::RGBA_8888;
-        real_internal_format = GL_RGBA;
-        break;
-      case GL_BGRA8_EXT:
-        buffer_format = gfx::BufferFormat::BGRA_8888;
-        real_internal_format = GL_BGRA_EXT;
-        break;
-      case GL_RGBA16F_EXT:
-        buffer_format = gfx::BufferFormat::RGBA_F16;
-        real_internal_format = GL_RGBA;
-        break;
-      default:
-        LOCAL_SET_GL_ERROR(GL_INVALID_ENUM, function_name,
-                           "Invalid buffer format");
-        return;
-    }
-
-    if (levels != 1) {
-      LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, function_name,
-                         "Levels != 1 for buffer");
-      return;
-    }
-    if (depth > 1) {
-      LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, function_name,
-                         "depth > 1 for buffer");
-      return;
-    }
-    DCHECK_EQ(GL_TEXTURE_BUFFER_SCANOUT_CHROMIUM, texture->buffer_usage());
-
-    gfx::BufferUsage buffer_usage = gfx::BufferUsage::SCANOUT;
-    scoped_refptr<gl::GLImage> image =
-        GetContextGroup()->image_factory()->CreateAnonymousImage(
-            gfx::Size(width, height), buffer_format, buffer_usage,
-            real_internal_format);
-    if (!image || !image->BindTexImage(target)) {
-      LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, function_name,
-                         "Cannot create GL Image");
-      return;
-    }
-
-    texture_manager()->SetLevelInfo(
-        texture_ref, target, 0, image->GetInternalFormat(), width, height, 1, 0,
-        image->GetInternalFormat(), GL_UNSIGNED_BYTE, gfx::Rect(size));
-    texture_manager()->SetLevelImage(texture_ref, target, 0, image.get(),
-                                     Texture::BOUND);
-    return;
-  }
-
   GLenum format = TextureManager::ExtractFormatFromStorageFormat(
       internal_format);
   GLenum type = TextureManager::ExtractTypeFromStorageFormat(internal_format);
 
   std::vector<int32_t> level_size(levels);
   {
     GLsizei level_width = width;
     GLsizei level_height = height;
     GLsizei level_depth = depth;
     base::CheckedNumeric<uint32_t> estimated_size(0);
@@ skipping 2299 matching lines @@
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "base/macros.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu