Remove placeholder commands

TEST=none
BUG=none

R=apatrick@chromium.org


Review URL: http://codereview.chromium.org/9290068

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119481 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 6 insertions, 153 deletions

diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py
index 57ca482..db0be00 100755
--- a/gpu/command_buffer/build_gles2_cmd_buffer.py
+++ b/gpu/command_buffer/build_gles2_cmd_buffer.py
@@ -1463,11 +1463,6 @@ _FUNCTION_INFO = {
     'chromium': True,
     'client_test': False,
   },
-  'Placeholder447CHROMIUM': {
-    'type': 'UnknownCommand',
-    'extension': True,
-    'chromium': True,
-  },
   'CreateStreamTextureCHROMIUM':  {
     'type': 'Custom',
     'cmd_args': 'GLuint client_id, void* result',
@@ -1486,11 +1481,6 @@ _FUNCTION_INFO = {
     'extension': True,
     'chromium': True,
    },
-  'Placeholder453CHROMIUM': {
-    'type': 'UnknownCommand',
-    'extension': True,
-    'chromium': True,
-  },
   'TexImageIOSurface2DCHROMIUM': {
     'decoder_func': 'DoTexImageIOSurface2DCHROMIUM',
     'unit_test': False,
@@ -4282,45 +4272,6 @@ TEST_F(%(test_name)s, %(name)sInvalidArgs) {
     """Overrriden from TypeHandler."""
     pass
 
-class UnknownCommandHandler(TypeHandler):
-  """Handler for commands that always fail with kUnknownCommand."""
-
-  def __init__(self):
-    TypeHandler.__init__(self)
-
-  def AddImmediateFunction(self, generator, func):
-    """Overrriden from TypeHandler."""
-    pass
-
-  def WriteServiceImplementation(self, func, file):
-    """Overrriden from TypeHandler."""
-    file.Write(
-        "error::Error GLES2DecoderImpl::Handle%s(\n" % func.name)
-    file.Write(
-        "    uint32 immediate_data_size, const gles2::%s& c) {\n" % func.name)
-    file.Write("  return error::kUnknownCommand;\n")
-    file.Write("}\n")
-
-  def WriteGLES2ImplementationHeader(self, func, file):
-    """Overrriden from TypeHandler."""
-    pass
-
-  def WriteCmdHelper(self, func, file):
-    """Overrriden from TypeHandler."""
-    pass
-
-  def WriteGLES2CLibImplementation(self, func, file):
-    """Overrriden from TypeHandler."""
-    pass
-
-  def WriteServiceUnitTest(self, func, file):
-    """Overrriden from TypeHandler."""
-    pass
-
-  def WriteGLES2ImplementationUnitTest(self, func, file):
-    """Overrriden from TypeHandler."""
-    pass
-
 
 class FunctionInfo(object):
   """Holds info about a function."""
@@ -5349,7 +5300,6 @@ class GLGenerator(object):
       'PUTXn': PUTXnHandler(),
       'STRn': STRnHandler(),
       'Todo': TodoHandler(),
-      'UnknownCommand': UnknownCommandHandler(),
     }
 
     for func_name in _FUNCTION_INFO:
@@ -5864,8 +5814,6 @@ const PPB_OpenGLES2* PPB_OpenGLES2_Shared::GetInterface() {
     for func in self.original_functions:
       if not func.IsCoreGLFunction():
         continue
-      if func.IsType("UnknownCommand"):
-        continue
       args = func.MakeTypedOriginalArgString("")
       if len(args) != 0:
         args = ", " + args
@@ -5889,8 +5837,7 @@ const PPB_OpenGLES2* PPB_OpenGLES2_Shared::GetInterface() {
     file.Write("  const static struct PPB_OpenGLES2 ppb_opengles = {\n")
     file.Write("    &")
     file.Write(",\n    &".join(
-      f.name for f in self.original_functions if (f.IsCoreGLFunction() and
-        not f.IsType("UnknownCommand"))))
+      f.name for f in self.original_functions if f.IsCoreGLFunction()))
     file.Write("\n")
     file.Write("  };\n")
     file.Write("  return &ppb_opengles;\n")
diff --git a/gpu/command_buffer/cmd_buffer_functions.txt b/gpu/command_buffer/cmd_buffer_functions.txt
index d69d8b5..4220b59 100644
--- a/gpu/command_buffer/cmd_buffer_functions.txt
+++ b/gpu/command_buffer/cmd_buffer_functions.txt
@@ -166,10 +166,8 @@ GL_APICALL void         GL_APIENTRY glRequestExtensionCHROMIUM (const char* exte
 GL_APICALL void         GL_APIENTRY glRateLimitOffscreenContextCHROMIUM (void);
 GL_APICALL void         GL_APIENTRY glGetMultipleIntegervCHROMIUM (const GLenum* pnames, GLuint count, GLint* results, GLsizeiptr size);
 GL_APICALL void         GL_APIENTRY glGetProgramInfoCHROMIUM (GLidProgram program, GLsizeiNotNegative bufsize, GLsizei* size, void* info);
-GL_APICALL void         GL_APIENTRY glPlaceholder447CHROMIUM (void);
 GL_APICALL GLuint       GL_APIENTRY glCreateStreamTextureCHROMIUM (GLuint texture);
 GL_APICALL void         GL_APIENTRY glDestroyStreamTextureCHROMIUM (GLuint texture);
-GL_APICALL void         GL_APIENTRY glPlaceholder453CHROMIUM (void);
 GL_APICALL void         GL_APIENTRY glGetTranslatedShaderSourceANGLE (GLidShader shader, GLsizeiNotNegative bufsize, GLsizei* length, char* source);
 GL_APICALL void         GL_APIENTRY glPostSubBufferCHROMIUM (GLint x, GLint y, GLint width, GLint height);
 GL_APICALL void         GL_APIENTRY glTexImageIOSurface2DCHROMIUM (GLenumTextureBindTarget target, GLsizei width, GLsizei height, GLuint ioSurfaceId, GLuint plane);
diff --git a/gpu/command_buffer/common/gles2_cmd_format_autogen.h b/gpu/command_buffer/common/gles2_cmd_format_autogen.h
index b86740f..34d266c 100644
--- a/gpu/command_buffer/common/gles2_cmd_format_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_format_autogen.h
@@ -9040,36 +9040,6 @@ COMPILE_ASSERT(offsetof(GetProgramInfoCHROMIUM::Result, num_attribs) == 4,
 COMPILE_ASSERT(offsetof(GetProgramInfoCHROMIUM::Result, num_uniforms) == 8,
                OffsetOf_GetProgramInfoCHROMIUM_Result_num_uniforms_not_8);
 
-struct Placeholder447CHROMIUM {
-  typedef Placeholder447CHROMIUM ValueType;
-  static const CommandId kCmdId = kPlaceholder447CHROMIUM;
-  static const cmd::ArgFlags kArgFlags = cmd::kFixed;
-
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
-  }
-
-  void SetHeader() {
-    header.SetCmd<ValueType>();
-  }
-
-  void Init() {
-    SetHeader();
-  }
-
-  void* Set(void* cmd) {
-    static_cast<ValueType*>(cmd)->Init();
-    return NextCmdAddress<ValueType>(cmd);
-  }
-
-  gpu::CommandHeader header;
-};
-
-COMPILE_ASSERT(sizeof(Placeholder447CHROMIUM) == 4,
-               Sizeof_Placeholder447CHROMIUM_is_not_4);
-COMPILE_ASSERT(offsetof(Placeholder447CHROMIUM, header) == 0,
-               OffsetOf_Placeholder447CHROMIUM_header_not_0);
-
 struct CreateStreamTextureCHROMIUM {
   typedef CreateStreamTextureCHROMIUM ValueType;
   static const CommandId kCmdId = kCreateStreamTextureCHROMIUM;
@@ -9152,36 +9122,6 @@ COMPILE_ASSERT(offsetof(DestroyStreamTextureCHROMIUM, header) == 0,
 COMPILE_ASSERT(offsetof(DestroyStreamTextureCHROMIUM, texture) == 4,
                OffsetOf_DestroyStreamTextureCHROMIUM_texture_not_4);
 
-struct Placeholder453CHROMIUM {
-  typedef Placeholder453CHROMIUM ValueType;
-  static const CommandId kCmdId = kPlaceholder453CHROMIUM;
-  static const cmd::ArgFlags kArgFlags = cmd::kFixed;
-
-  static uint32 ComputeSize() {
-    return static_cast<uint32>(sizeof(ValueType));  // NOLINT
-  }
-
-  void SetHeader() {
-    header.SetCmd<ValueType>();
-  }
-
-  void Init() {
-    SetHeader();
-  }
-
-  void* Set(void* cmd) {
-    static_cast<ValueType*>(cmd)->Init();
-    return NextCmdAddress<ValueType>(cmd);
-  }
-
-  gpu::CommandHeader header;
-};
-
-COMPILE_ASSERT(sizeof(Placeholder453CHROMIUM) == 4,
-               Sizeof_Placeholder453CHROMIUM_is_not_4);
-COMPILE_ASSERT(offsetof(Placeholder453CHROMIUM, header) == 0,
-               OffsetOf_Placeholder453CHROMIUM_header_not_0);
-
 struct GetTranslatedShaderSourceANGLE {
   typedef GetTranslatedShaderSourceANGLE ValueType;
   static const CommandId kCmdId = kGetTranslatedShaderSourceANGLE;
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 b7d8705..7e3efb8 100644
--- a/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_format_test_autogen.h
@@ -3510,17 +3510,6 @@ TEST_F(GLES2FormatTest, GetProgramInfoCHROMIUM) {
       next_cmd, sizeof(cmd));
 }
 
-TEST_F(GLES2FormatTest, Placeholder447CHROMIUM) {
-  Placeholder447CHROMIUM& cmd = *GetBufferAs<Placeholder447CHROMIUM>();
-  void* next_cmd = cmd.Set(
-      &cmd);
-  EXPECT_EQ(static_cast<uint32>(Placeholder447CHROMIUM::kCmdId),
-            cmd.header.command);
-  EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
-  CheckBytesWrittenMatchesExpectedSize(
-      next_cmd, sizeof(cmd));
-}
-
 TEST_F(GLES2FormatTest, CreateStreamTextureCHROMIUM) {
   CreateStreamTextureCHROMIUM& cmd =
       *GetBufferAs<CreateStreamTextureCHROMIUM>();
@@ -3553,17 +3542,6 @@ TEST_F(GLES2FormatTest, DestroyStreamTextureCHROMIUM) {
       next_cmd, sizeof(cmd));
 }
 
-TEST_F(GLES2FormatTest, Placeholder453CHROMIUM) {
-  Placeholder453CHROMIUM& cmd = *GetBufferAs<Placeholder453CHROMIUM>();
-  void* next_cmd = cmd.Set(
-      &cmd);
-  EXPECT_EQ(static_cast<uint32>(Placeholder453CHROMIUM::kCmdId),
-            cmd.header.command);
-  EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);
-  CheckBytesWrittenMatchesExpectedSize(
-      next_cmd, sizeof(cmd));
-}
-
 TEST_F(GLES2FormatTest, GetTranslatedShaderSourceANGLE) {
   GetTranslatedShaderSourceANGLE& cmd =
       *GetBufferAs<GetTranslatedShaderSourceANGLE>();
diff --git a/gpu/command_buffer/common/gles2_cmd_ids_autogen.h b/gpu/command_buffer/common/gles2_cmd_ids_autogen.h
index 184ff8d..a57c0cd 100644
--- a/gpu/command_buffer/common/gles2_cmd_ids_autogen.h
+++ b/gpu/command_buffer/common/gles2_cmd_ids_autogen.h
@@ -207,13 +207,11 @@
   OP(RequestExtensionCHROMIUM)                                 /* 450 */ \
   OP(GetMultipleIntegervCHROMIUM)                              /* 451 */ \
   OP(GetProgramInfoCHROMIUM)                                   /* 452 */ \
-  OP(Placeholder447CHROMIUM)                                   /* 453 */ \
-  OP(CreateStreamTextureCHROMIUM)                              /* 454 */ \
-  OP(DestroyStreamTextureCHROMIUM)                             /* 455 */ \
-  OP(Placeholder453CHROMIUM)                                   /* 456 */ \
-  OP(GetTranslatedShaderSourceANGLE)                           /* 457 */ \
-  OP(PostSubBufferCHROMIUM)                                    /* 458 */ \
-  OP(TexImageIOSurface2DCHROMIUM)                              /* 459 */ \
+  OP(CreateStreamTextureCHROMIUM)                              /* 453 */ \
+  OP(DestroyStreamTextureCHROMIUM)                             /* 454 */ \
+  OP(GetTranslatedShaderSourceANGLE)                           /* 455 */ \
+  OP(PostSubBufferCHROMIUM)                                    /* 456 */ \
+  OP(TexImageIOSurface2DCHROMIUM)                              /* 457 */ \
 
 enum CommandId {
   kStartPoint = cmd::kLastCommonId,  // All GLES2 commands start after this.
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
index d36f425..4c84062 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_autogen.h
@@ -2600,14 +2600,6 @@ error::Error GLES2DecoderImpl::HandleGetMaxValueInBufferCHROMIUM(
   return error::kNoError;
 }
 
-error::Error GLES2DecoderImpl::HandlePlaceholder447CHROMIUM(
-    uint32 immediate_data_size, const gles2::Placeholder447CHROMIUM& c) {
-  return error::kUnknownCommand;
-}
-error::Error GLES2DecoderImpl::HandlePlaceholder453CHROMIUM(
-    uint32 immediate_data_size, const gles2::Placeholder453CHROMIUM& c) {
-  return error::kUnknownCommand;
-}
 error::Error GLES2DecoderImpl::HandleTexImageIOSurface2DCHROMIUM(
     uint32 immediate_data_size, const gles2::TexImageIOSurface2DCHROMIUM& c) {
   GLenum target = static_cast<GLenum>(c.target);