Remove glCompressedCopySubTextureCHROMIUM.

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

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

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

3 files changed, 65 insertions, 177 deletions

diff --git a/gpu/command_buffer/common/gles2_cmd_format_autogen.h b/gpu/command_buffer/common/gles2_cmd_format_autogen.h
index 3419f6c..23a5011 100644
--- a/gpu/command_buffer/common/gles2_cmd_format_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_format_autogen.h
@@ -12533,93 +12533,6 @@ static_assert(offsetof(CompressedCopyTextureCHROMIUM, source_id) == 8,
 static_assert(offsetof(CompressedCopyTextureCHROMIUM, dest_id) == 12,
               "offset of CompressedCopyTextureCHROMIUM dest_id should be 12");
 
-struct CompressedCopySubTextureCHROMIUM {
-  typedef CompressedCopySubTextureCHROMIUM ValueType;
-  static const CommandId kCmdId = kCompressedCopySubTextureCHROMIUM;
-  static const cmd::ArgFlags kArgFlags = cmd::kFixed;
-  static const uint8_t cmd_flags = CMD_FLAG_SET_TRACE_LEVEL(3);
-
-  static uint32_t ComputeSize() {
-    return static_cast<uint32_t>(sizeof(ValueType));  // NOLINT
-  }
-
-  void SetHeader() { header.SetCmd<ValueType>(); }
-
-  void Init(GLenum _target,
-            GLenum _source_id,
-            GLenum _dest_id,
-            GLint _xoffset,
-            GLint _yoffset,
-            GLint _x,
-            GLint _y,
-            GLsizei _width,
-            GLsizei _height) {
-    SetHeader();
-    target = _target;
-    source_id = _source_id;
-    dest_id = _dest_id;
-    xoffset = _xoffset;
-    yoffset = _yoffset;
-    x = _x;
-    y = _y;
-    width = _width;
-    height = _height;
-  }
-
-  void* Set(void* cmd,
-            GLenum _target,
-            GLenum _source_id,
-            GLenum _dest_id,
-            GLint _xoffset,
-            GLint _yoffset,
-            GLint _x,
-            GLint _y,
-            GLsizei _width,
-            GLsizei _height) {
-    static_cast<ValueType*>(cmd)->Init(_target, _source_id, _dest_id, _xoffset,
-                                       _yoffset, _x, _y, _width, _height);
-    return NextCmdAddress<ValueType>(cmd);
-  }
-
-  gpu::CommandHeader header;
-  uint32_t target;
-  uint32_t source_id;
-  uint32_t dest_id;
-  int32_t xoffset;
-  int32_t yoffset;
-  int32_t x;
-  int32_t y;
-  int32_t width;
-  int32_t height;
-};
-
-static_assert(sizeof(CompressedCopySubTextureCHROMIUM) == 40,
-              "size of CompressedCopySubTextureCHROMIUM should be 40");
-static_assert(offsetof(CompressedCopySubTextureCHROMIUM, header) == 0,
-              "offset of CompressedCopySubTextureCHROMIUM header should be 0");
-static_assert(offsetof(CompressedCopySubTextureCHROMIUM, target) == 4,
-              "offset of CompressedCopySubTextureCHROMIUM target should be 4");
-static_assert(
-    offsetof(CompressedCopySubTextureCHROMIUM, source_id) == 8,
-    "offset of CompressedCopySubTextureCHROMIUM source_id should be 8");
-static_assert(
-    offsetof(CompressedCopySubTextureCHROMIUM, dest_id) == 12,
-    "offset of CompressedCopySubTextureCHROMIUM dest_id should be 12");
-static_assert(
-    offsetof(CompressedCopySubTextureCHROMIUM, xoffset) == 16,
-    "offset of CompressedCopySubTextureCHROMIUM xoffset should be 16");
-static_assert(
-    offsetof(CompressedCopySubTextureCHROMIUM, yoffset) == 20,
-    "offset of CompressedCopySubTextureCHROMIUM yoffset should be 20");
-static_assert(offsetof(CompressedCopySubTextureCHROMIUM, x) == 24,
-              "offset of CompressedCopySubTextureCHROMIUM x should be 24");
-static_assert(offsetof(CompressedCopySubTextureCHROMIUM, y) == 28,
-              "offset of CompressedCopySubTextureCHROMIUM y should be 28");
-static_assert(offsetof(CompressedCopySubTextureCHROMIUM, width) == 32,
-              "offset of CompressedCopySubTextureCHROMIUM width should be 32");
-static_assert(offsetof(CompressedCopySubTextureCHROMIUM, height) == 36,
-              "offset of CompressedCopySubTextureCHROMIUM height should be 36");
-
 struct DrawArraysInstancedANGLE {
   typedef DrawArraysInstancedANGLE ValueType;
   static const CommandId kCmdId = kDrawArraysInstancedANGLE;
diff --git a/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h b/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
index f8ebe0f..727fc7d 100644
--- a/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
@@ -4199,30 +4199,6 @@ TEST_F(GLES2FormatTest, CompressedCopyTextureCHROMIUM) {
   CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
 }
 
-TEST_F(GLES2FormatTest, CompressedCopySubTextureCHROMIUM) {
-  cmds::CompressedCopySubTextureCHROMIUM& cmd =
-      *GetBufferAs<cmds::CompressedCopySubTextureCHROMIUM>();
-  void* next_cmd = cmd.Set(&cmd, static_cast<GLenum>(11),
-                           static_cast<GLenum>(12), static_cast<GLenum>(13),
-                           static_cast<GLint>(14), static_cast<GLint>(15),
-                           static_cast<GLint>(16), static_cast<GLint>(17),
-                           static_cast<GLsizei>(18), static_cast<GLsizei>(19));
-  EXPECT_EQ(
-      static_cast<uint32_t>(cmds::CompressedCopySubTextureCHROMIUM::kCmdId),
-      cmd.header.command);
-  EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
-  EXPECT_EQ(static_cast<GLenum>(11), cmd.target);
-  EXPECT_EQ(static_cast<GLenum>(12), cmd.source_id);
-  EXPECT_EQ(static_cast<GLenum>(13), cmd.dest_id);
-  EXPECT_EQ(static_cast<GLint>(14), cmd.xoffset);
-  EXPECT_EQ(static_cast<GLint>(15), cmd.yoffset);
-  EXPECT_EQ(static_cast<GLint>(16), cmd.x);
-  EXPECT_EQ(static_cast<GLint>(17), cmd.y);
-  EXPECT_EQ(static_cast<GLsizei>(18), cmd.width);
-  EXPECT_EQ(static_cast<GLsizei>(19), cmd.height);
-  CheckBytesWrittenMatchesExpectedSize(next_cmd, sizeof(cmd));
-}
-
 TEST_F(GLES2FormatTest, DrawArraysInstancedANGLE) {
   cmds::DrawArraysInstancedANGLE& cmd =
       *GetBufferAs<cmds::DrawArraysInstancedANGLE>();
diff --git a/gpu/command_buffer/common/gles2_cmd_ids_autogen.h b/gpu/command_buffer/common/gles2_cmd_ids_autogen.h
index 1d8cfd6..9091f41 100644
--- a/gpu/command_buffer/common/gles2_cmd_ids_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_ids_autogen.h
@@ -271,72 +271,71 @@
   OP(CopyTextureCHROMIUM)                         /* 512 */ \
   OP(CopySubTextureCHROMIUM)                      /* 513 */ \
   OP(CompressedCopyTextureCHROMIUM)               /* 514 */ \
-  OP(CompressedCopySubTextureCHROMIUM)            /* 515 */ \
-  OP(DrawArraysInstancedANGLE)                    /* 516 */ \
-  OP(DrawElementsInstancedANGLE)                  /* 517 */ \
-  OP(VertexAttribDivisorANGLE)                    /* 518 */ \
-  OP(GenMailboxCHROMIUM)                          /* 519 */ \
-  OP(ProduceTextureCHROMIUMImmediate)             /* 520 */ \
-  OP(ProduceTextureDirectCHROMIUMImmediate)       /* 521 */ \
-  OP(ConsumeTextureCHROMIUMImmediate)             /* 522 */ \
-  OP(CreateAndConsumeTextureCHROMIUMImmediate)    /* 523 */ \
-  OP(BindUniformLocationCHROMIUMBucket)           /* 524 */ \
-  OP(GenValuebuffersCHROMIUMImmediate)            /* 525 */ \
-  OP(DeleteValuebuffersCHROMIUMImmediate)         /* 526 */ \
-  OP(IsValuebufferCHROMIUM)                       /* 527 */ \
-  OP(BindValuebufferCHROMIUM)                     /* 528 */ \
-  OP(SubscribeValueCHROMIUM)                      /* 529 */ \
-  OP(PopulateSubscribedValuesCHROMIUM)            /* 530 */ \
-  OP(UniformValuebufferCHROMIUM)                  /* 531 */ \
-  OP(BindTexImage2DCHROMIUM)                      /* 532 */ \
-  OP(ReleaseTexImage2DCHROMIUM)                   /* 533 */ \
-  OP(TraceBeginCHROMIUM)                          /* 534 */ \
-  OP(TraceEndCHROMIUM)                            /* 535 */ \
-  OP(DiscardFramebufferEXTImmediate)              /* 536 */ \
-  OP(LoseContextCHROMIUM)                         /* 537 */ \
-  OP(InsertSyncPointCHROMIUM)                     /* 538 */ \
-  OP(WaitSyncPointCHROMIUM)                       /* 539 */ \
-  OP(InsertFenceSyncCHROMIUM)                     /* 540 */ \
-  OP(GenSyncTokenCHROMIUMImmediate)               /* 541 */ \
-  OP(GenUnverifiedSyncTokenCHROMIUMImmediate)     /* 542 */ \
-  OP(VerifySyncTokensCHROMIUMImmediate)           /* 543 */ \
-  OP(WaitSyncTokenCHROMIUM)                       /* 544 */ \
-  OP(DrawBuffersEXTImmediate)                     /* 545 */ \
-  OP(DiscardBackbufferCHROMIUM)                   /* 546 */ \
-  OP(ScheduleOverlayPlaneCHROMIUM)                /* 547 */ \
-  OP(ScheduleCALayerCHROMIUM)                     /* 548 */ \
-  OP(CommitOverlayPlanesCHROMIUM)                 /* 549 */ \
-  OP(SwapInterval)                                /* 550 */ \
-  OP(FlushDriverCachesCHROMIUM)                   /* 551 */ \
-  OP(MatrixLoadfCHROMIUMImmediate)                /* 552 */ \
-  OP(MatrixLoadIdentityCHROMIUM)                  /* 553 */ \
-  OP(GenPathsCHROMIUM)                            /* 554 */ \
-  OP(DeletePathsCHROMIUM)                         /* 555 */ \
-  OP(IsPathCHROMIUM)                              /* 556 */ \
-  OP(PathCommandsCHROMIUM)                        /* 557 */ \
-  OP(PathParameterfCHROMIUM)                      /* 558 */ \
-  OP(PathParameteriCHROMIUM)                      /* 559 */ \
-  OP(PathStencilFuncCHROMIUM)                     /* 560 */ \
-  OP(StencilFillPathCHROMIUM)                     /* 561 */ \
-  OP(StencilStrokePathCHROMIUM)                   /* 562 */ \
-  OP(CoverFillPathCHROMIUM)                       /* 563 */ \
-  OP(CoverStrokePathCHROMIUM)                     /* 564 */ \
-  OP(StencilThenCoverFillPathCHROMIUM)            /* 565 */ \
-  OP(StencilThenCoverStrokePathCHROMIUM)          /* 566 */ \
-  OP(StencilFillPathInstancedCHROMIUM)            /* 567 */ \
-  OP(StencilStrokePathInstancedCHROMIUM)          /* 568 */ \
-  OP(CoverFillPathInstancedCHROMIUM)              /* 569 */ \
-  OP(CoverStrokePathInstancedCHROMIUM)            /* 570 */ \
-  OP(StencilThenCoverFillPathInstancedCHROMIUM)   /* 571 */ \
-  OP(StencilThenCoverStrokePathInstancedCHROMIUM) /* 572 */ \
-  OP(BindFragmentInputLocationCHROMIUMBucket)     /* 573 */ \
-  OP(ProgramPathFragmentInputGenCHROMIUM)         /* 574 */ \
-  OP(CoverageModulationCHROMIUM)                  /* 575 */ \
-  OP(BlendBarrierKHR)                             /* 576 */ \
-  OP(ApplyScreenSpaceAntialiasingCHROMIUM)        /* 577 */ \
-  OP(BindFragDataLocationIndexedEXTBucket)        /* 578 */ \
-  OP(BindFragDataLocationEXTBucket)               /* 579 */ \
-  OP(GetFragDataIndexEXT)                         /* 580 */
+  OP(DrawArraysInstancedANGLE)                    /* 515 */ \
+  OP(DrawElementsInstancedANGLE)                  /* 516 */ \
+  OP(VertexAttribDivisorANGLE)                    /* 517 */ \
+  OP(GenMailboxCHROMIUM)                          /* 518 */ \
+  OP(ProduceTextureCHROMIUMImmediate)             /* 519 */ \
+  OP(ProduceTextureDirectCHROMIUMImmediate)       /* 520 */ \
+  OP(ConsumeTextureCHROMIUMImmediate)             /* 521 */ \
+  OP(CreateAndConsumeTextureCHROMIUMImmediate)    /* 522 */ \
+  OP(BindUniformLocationCHROMIUMBucket)           /* 523 */ \
+  OP(GenValuebuffersCHROMIUMImmediate)            /* 524 */ \
+  OP(DeleteValuebuffersCHROMIUMImmediate)         /* 525 */ \
+  OP(IsValuebufferCHROMIUM)                       /* 526 */ \
+  OP(BindValuebufferCHROMIUM)                     /* 527 */ \
+  OP(SubscribeValueCHROMIUM)                      /* 528 */ \
+  OP(PopulateSubscribedValuesCHROMIUM)            /* 529 */ \
+  OP(UniformValuebufferCHROMIUM)                  /* 530 */ \
+  OP(BindTexImage2DCHROMIUM)                      /* 531 */ \
+  OP(ReleaseTexImage2DCHROMIUM)                   /* 532 */ \
+  OP(TraceBeginCHROMIUM)                          /* 533 */ \
+  OP(TraceEndCHROMIUM)                            /* 534 */ \
+  OP(DiscardFramebufferEXTImmediate)              /* 535 */ \
+  OP(LoseContextCHROMIUM)                         /* 536 */ \
+  OP(InsertSyncPointCHROMIUM)                     /* 537 */ \
+  OP(WaitSyncPointCHROMIUM)                       /* 538 */ \
+  OP(InsertFenceSyncCHROMIUM)                     /* 539 */ \
+  OP(GenSyncTokenCHROMIUMImmediate)               /* 540 */ \
+  OP(GenUnverifiedSyncTokenCHROMIUMImmediate)     /* 541 */ \
+  OP(VerifySyncTokensCHROMIUMImmediate)           /* 542 */ \
+  OP(WaitSyncTokenCHROMIUM)                       /* 543 */ \
+  OP(DrawBuffersEXTImmediate)                     /* 544 */ \
+  OP(DiscardBackbufferCHROMIUM)                   /* 545 */ \
+  OP(ScheduleOverlayPlaneCHROMIUM)                /* 546 */ \
+  OP(ScheduleCALayerCHROMIUM)                     /* 547 */ \
+  OP(CommitOverlayPlanesCHROMIUM)                 /* 548 */ \
+  OP(SwapInterval)                                /* 549 */ \
+  OP(FlushDriverCachesCHROMIUM)                   /* 550 */ \
+  OP(MatrixLoadfCHROMIUMImmediate)                /* 551 */ \
+  OP(MatrixLoadIdentityCHROMIUM)                  /* 552 */ \
+  OP(GenPathsCHROMIUM)                            /* 553 */ \
+  OP(DeletePathsCHROMIUM)                         /* 554 */ \
+  OP(IsPathCHROMIUM)                              /* 555 */ \
+  OP(PathCommandsCHROMIUM)                        /* 556 */ \
+  OP(PathParameterfCHROMIUM)                      /* 557 */ \
+  OP(PathParameteriCHROMIUM)                      /* 558 */ \
+  OP(PathStencilFuncCHROMIUM)                     /* 559 */ \
+  OP(StencilFillPathCHROMIUM)                     /* 560 */ \
+  OP(StencilStrokePathCHROMIUM)                   /* 561 */ \
+  OP(CoverFillPathCHROMIUM)                       /* 562 */ \
+  OP(CoverStrokePathCHROMIUM)                     /* 563 */ \
+  OP(StencilThenCoverFillPathCHROMIUM)            /* 564 */ \
+  OP(StencilThenCoverStrokePathCHROMIUM)          /* 565 */ \
+  OP(StencilFillPathInstancedCHROMIUM)            /* 566 */ \
+  OP(StencilStrokePathInstancedCHROMIUM)          /* 567 */ \
+  OP(CoverFillPathInstancedCHROMIUM)              /* 568 */ \
+  OP(CoverStrokePathInstancedCHROMIUM)            /* 569 */ \
+  OP(StencilThenCoverFillPathInstancedCHROMIUM)   /* 570 */ \
+  OP(StencilThenCoverStrokePathInstancedCHROMIUM) /* 571 */ \
+  OP(BindFragmentInputLocationCHROMIUMBucket)     /* 572 */ \
+  OP(ProgramPathFragmentInputGenCHROMIUM)         /* 573 */ \
+  OP(CoverageModulationCHROMIUM)                  /* 574 */ \
+  OP(BlendBarrierKHR)                             /* 575 */ \
+  OP(ApplyScreenSpaceAntialiasingCHROMIUM)        /* 576 */ \
+  OP(BindFragDataLocationIndexedEXTBucket)        /* 577 */ \
+  OP(BindFragDataLocationEXTBucket)               /* 578 */ \
+  OP(GetFragDataIndexEXT)                         /* 579 */
 
 enum CommandId {
   kStartPoint = cmd::kLastCommonId,  // All GLES2 commands start after this.