Remove glCompressedCopySubTextureCHROMIUM.

Remove glCompressedCopySubTextureCHROMIUM.

BUG=574278
TEST=gl_tests,gpu_unittests
R=piman@chromium.org
TBR=yzshen@chromium.org

Committed: https://crrev.com/aa47b1e2ec83eddfaa5bca69e219b9967bd39b97
Cr-Commit-Position: refs/heads/master@{#367985}

[Zhenyao Mo, 2016-01-06 20:36:32]

The CQ bit was checked by zmo@chromium.org to run a CQ dry run

[Zhenyao Mo, 2016-01-06 20:37:30]

piman: PTAL

[commit-bot: I haz the power, 2016-01-06 20:37:31]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1565953002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1565953002/1

[commit-bot: I haz the power, 2016-01-06 20:40:33]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-01-06 20:40:33]

Dry run: Try jobs failed on following builders:
  ios_dbg_simulator_ninja on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_dbg_simulator...)
  ios_rel_device_ninja on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_rel_device_ni...)
  mac_chromium_compile_dbg_ng on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_comp...)
  mac_chromium_gn_rel on tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_gn_r...)

[yzshen1, 2016-01-06 20:41:01]

On 2016/01/06 20:37:31, commit-bot: I haz the power wrote:
> Dry run: CQ is trying da patch. Follow status at
>  https://chromium-cq-status.appspot.com/patch-status/1565953002/1
> View timeline at
>  https://chromium-cq-status.appspot.com/patch-timeline/1565953002/1

rubber stamp LGTM for mojo

(Please wait for LG from piman.)

[piman, 2016-01-06 20:47:25]

lgtm

[Zhenyao Mo, 2016-01-06 20:52:52]

The CQ bit was checked by zmo@chromium.org

[Zhenyao Mo, 2016-01-06 20:52:52]

The patchset sent to the CQ was uploaded after l-g-t-m from yzshen@chromium.org,
piman@chromium.org
Link to the patchset: https://codereview.chromium.org/1565953002/#ps20001
(title: "rebase")

[commit-bot: I haz the power, 2016-01-06 20:54:43]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1565953002/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1565953002/20001

[commit-bot: I haz the power, 2016-01-06 22:06:44]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-01-06 22:06:44]

Failed to apply patch for gpu/command_buffer/service/gles2_cmd_decoder.cc:
While running git apply --index -3 -p1;
  error: patch failed: gpu/command_buffer/service/gles2_cmd_decoder.cc:13683
  Falling back to three-way merge...
  Applied patch to 'gpu/command_buffer/service/gles2_cmd_decoder.cc' with
conflicts.
  U gpu/command_buffer/service/gles2_cmd_decoder.cc

Patch:       gpu/command_buffer/service/gles2_cmd_decoder.cc
Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc
b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index
cb76d44f5d0a55f5299c9bf07d05dfdbb0e77364..dc7db1c3857a66afdcda05d6eefa23c50d351edd
100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -964,16 +964,6 @@ class GLES2DecoderImpl : public GLES2Decoder, public
ErrorStateClient {
                                        GLuint source_id,
                                        GLuint dest_id);
 
-  void DoCompressedCopySubTextureCHROMIUM(GLenum target,
-                                          GLuint source_id,
-                                          GLuint dest_id,
-                                          GLint xoffset,
-                                          GLint yoffset,
-                                          GLint x,
-                                          GLint y,
-                                          GLsizei width,
-                                          GLsizei height);
-
   // Wrapper for TexStorage2DEXT.
   void DoTexStorage2DEXT(
       GLenum target,
@@ -13683,225 +13673,6 @@ void
GLES2DecoderImpl::DoCompressedCopyTextureCHROMIUM(GLenum target,
   }
 }
 
-void GLES2DecoderImpl::DoCompressedCopySubTextureCHROMIUM(GLenum target,
-                                                          GLuint source_id,
-                                                          GLuint dest_id,
-                                                          GLint xoffset,
-                                                          GLint yoffset,
-                                                          GLint x,
-                                                          GLint y,
-                                                          GLsizei width,
-                                                          GLsizei height) {
-  TRACE_EVENT0("gpu", "GLES2DecoderImpl::DoCompressedCopySubTextureCHROMIUM");
-
-  TextureRef* source_texture_ref = GetTexture(source_id);
-  TextureRef* dest_texture_ref = GetTexture(dest_id);
-
-  if (!source_texture_ref || !dest_texture_ref) {
-    LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glCompressedCopySubTextureCHROMIUM",
-                       "unknown texture ids");
-    return;
-  }
-
-  Texture* source_texture = source_texture_ref->texture();
-  Texture* dest_texture = dest_texture_ref->texture();
-  int source_width = 0;
-  int source_height = 0;
-  gl::GLImage* image =
-      source_texture->GetLevelImage(source_texture->target(), 0);
-  if (image) {
-    gfx::Size size = image->GetSize();
-    source_width = size.width();
-    source_height = size.height();
-    if (source_width <= 0 || source_height <= 0) {
-      LOCAL_SET_GL_ERROR(GL_INVALID_VALUE,
"glCompressedCopySubTextureCHROMIUM",
-                         "invalid image size");
-      return;
-    }
-  } else {
-    if (!source_texture->GetLevelSize(source_texture->target(), 0,
-                                      &source_width, &source_height, nullptr))
{
-      LOCAL_SET_GL_ERROR(GL_INVALID_VALUE,
"glCompressedCopySubTextureCHROMIUM",
-                         "source texture has no level 0");
-      return;
-    }
-
-    // Check that this type of texture is allowed.
-    if (!texture_manager()->ValidForTarget(source_texture->target(), 0,
-                                           source_width, source_height, 1)) {
-      LOCAL_SET_GL_ERROR(GL_INVALID_VALUE,
"glCompressedCopySubTextureCHROMIUM",
-                         "source texture bad dimensions");
-      return;
-    }
-  }
-
-  GLenum source_type = 0;
-  GLenum source_internal_format = 0;
-  source_texture->GetLevelType(source_texture->target(), 0, &source_type,
-                               &source_internal_format);
-  if (!source_texture->ValidForTexture(source_texture->target(), 0, x, y, 0,
-                                       width, height, 1)) {
-    LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glCompressedCopySubTextureCHROMIUM",
-                       "source texture bad dimensions.");
-    return;
-  }
-
-  GLenum dest_type = 0;
-  GLenum dest_internal_format = 0;
-  bool dest_level_defined = dest_texture->GetLevelType(
-      dest_texture->target(), 0, &dest_type, &dest_internal_format);
-  if (!dest_level_defined) {
-    LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION,
-                       "glCompressedCopySubTextureCHROMIUM",
-                       "destination texture is not defined");
-    return;
-  }
-  if (!dest_texture->ValidForTexture(dest_texture->target(), 0, xoffset,
-                                     yoffset, 0, width, height, 1)) {
-    LOCAL_SET_GL_ERROR(GL_INVALID_VALUE, "glCompressedCopySubTextureCHROMIUM",
-                       "destination texture bad dimensions.");
-    return;
-  }
-
-  if (!ValidateCompressedCopyTextureCHROMIUM(
-          "glCompressedCopySubTextureCHROMIUM", target, source_texture_ref,
-          dest_texture_ref)) {
-    return;
-  }
-
-  if (!ValidateCompressedTexSubDimensions("glCompressedCopySubTextureCHROMIUM",
-                                          source_texture->target(), 0, x, y, 0,
-                                          width, height, 1,
-                                          source_internal_format,
-                                          source_texture) ||
-      !ValidateCompressedTexSubDimensions("glCompressedCopySubTextureCHROMIUM",
-                                          dest_texture->target(), 0,
-                                          xoffset, yoffset, 0, width, height,
1,
-                                          dest_internal_format,
-                                          dest_texture)) {
-    return;
-  }
-
-  // Defer initializing the CopyTextureCHROMIUMResourceManager until it is
-  // needed because it takes 10s of milliseconds to initialize.
-  if (!copy_texture_CHROMIUM_.get()) {
-    LOCAL_COPY_REAL_GL_ERRORS_TO_WRAPPER("glCompressedCopySubTextureCHROMIUM");
-    copy_texture_CHROMIUM_.reset(new CopyTextureCHROMIUMResourceManager());
-    copy_texture_CHROMIUM_->Initialize(this);
-    RestoreCurrentFramebufferBindings();
-    if (LOCAL_PEEK_GL_ERROR("glCompressedCopySubTextureCHROMIUM") !=
-            GL_NO_ERROR) {
-      return;
-    }
-  }
-
-  // Clear the source texture if necessary.
-  if (!texture_manager()->ClearTextureLevel(this, source_texture_ref,
-                                            source_texture->target(), 0)) {
-    LOCAL_SET_GL_ERROR(GL_OUT_OF_MEMORY, "glCompressedCopySubTextureCHROMIUM",
-                       "source texture dimensions too big");
-    return;
-  }
-
-  int dest_width = 0;
-  int dest_height = 0;
-  bool ok = dest_texture->GetLevelSize(
-      GL_TEXTURE_2D, 0, &dest_width, &dest_height, nullptr);
-  DCHECK(ok);
-  if (xoffset != 0 || yoffset != 0 || width != dest_width ||
-      height != dest_height) {
-    gfx::Rect cleared_rect;
-    if (TextureManager::CombineAdjacentRects(
-            dest_texture->GetLevelClearedRect(target, 0),
-            gfx::Rect(xoffset, yoffset, width, height), &cleared_rect)) {
-      DCHECK_GE(cleared_rect.size().GetArea(),
-                dest_texture->GetLevelClearedRect(target, 0).size().GetArea());
-      texture_manager()->SetLevelClearedRect(dest_texture_ref, target, 0,
-                                             cleared_rect);
-    } else {
-      // Otherwise clear part of texture level that is not already cleared.
-      if (!texture_manager()->ClearTextureLevel(this, dest_texture_ref, target,
-                                                0)) {
-        LOCAL_SET_GL_ERROR(GL_OUT_OF_MEMORY,
-                           "glCompressedCopySubTextureCHROMIUM",
-                           "destination texture dimensions too big");
-        return;
-      }
-    }
-  } else {
-    texture_manager()->SetLevelCleared(dest_texture_ref, GL_TEXTURE_2D, 0,
-                                       true);
-  }
-
-  ScopedTextureBinder binder(
-      &state_, dest_texture->service_id(), GL_TEXTURE_2D);
-
-  // Try using GLImage::CopyTexSubImage when possible.
-  if (image &&
-      image->CopyTexSubImage(GL_TEXTURE_2D, gfx::Point(xoffset, yoffset),
-                             gfx::Rect(x, y, width, height))) {
-    return;
-  }
-
-  TRACE_EVENT0(
-      "gpu",
-      "GLES2DecoderImpl::DoCompressedCopySubTextureCHROMIUM, fallback");
-
-  DoCopyTexImageIfNeeded(source_texture, source_texture->target());
-
-  // As a fallback, copy into a non-compressed GL_RGBA texture.
-  if (dest_internal_format != GL_RGBA) {
-    // To preserve the contents of the original destination texture we must
-    // first copy the original destination texture to a temporary storage, then
-    // copy it back to the original destination texture.
-    GLuint tmp_service_id;
-    glGenTextures(1, &tmp_service_id);
-    DCHECK_NE(0u, tmp_service_id);
-
-    glBindTexture(GL_TEXTURE_2D, tmp_service_id);
-
-    LOCAL_COPY_REAL_GL_ERRORS_TO_WRAPPER("glCompressedCopyTextureCHROMIUM");
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, dest_width, dest_height, 0,
GL_RGBA,
-                 GL_UNSIGNED_BYTE, NULL);
-    GLenum error = LOCAL_PEEK_GL_ERROR("glCompressedCopySubTextureCHROMIUM");
-    if (error != GL_NO_ERROR)
-      return;
-
-    copy_texture_CHROMIUM_->DoCopyTexture(
-        this, dest_texture->target(), dest_texture->service_id(),
-        dest_internal_format, tmp_service_id, GL_RGBA,
-        dest_width, dest_height, false, false, false);
-
-    // Redefine destinati…
(message too large)

[commit-bot: I haz the power, 2016-01-06 22:06:46]

The CQ bit was unchecked by commit-bot@chromium.org

[Zhenyao Mo, 2016-01-07 00:31:02]

The CQ bit was checked by zmo@chromium.org

[Zhenyao Mo, 2016-01-07 00:31:03]

The patchset sent to the CQ was uploaded after l-g-t-m from yzshen@chromium.org,
piman@chromium.org
Link to the patchset: https://codereview.chromium.org/1565953002/#ps40001
(title: "rebase")

[commit-bot: I haz the power, 2016-01-07 00:33:03]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1565953002/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1565953002/40001

[commit-bot: I haz the power, 2016-01-07 01:58:50]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2016-01-07 01:59:38]

Description was changed from

==========
Remove glCompressedCopySubTextureCHROMIUM.

BUG=574278
TEST=gl_tests,gpu_unittests
R=piman@chromium.org
TBR=yzshen@chromium.org
==========

to

==========
Remove glCompressedCopySubTextureCHROMIUM.

BUG=574278
TEST=gl_tests,gpu_unittests
R=piman@chromium.org
TBR=yzshen@chromium.org

Committed: https://crrev.com/aa47b1e2ec83eddfaa5bca69e219b9967bd39b97
Cr-Commit-Position: refs/heads/master@{#367985}
==========

[commit-bot: I haz the power, 2016-01-07 01:59:38]

Patchset 3 (id:??) landed as
https://crrev.com/aa47b1e2ec83eddfaa5bca69e219b9967bd39b97
Cr-Commit-Position: refs/heads/master@{#367985}