Delete copy_texture_to_parent_texture from GPU command buffer code.

gpu/command_buffer/build_gles2_cmd_buffer.py

 #!/usr/bin/python
 #
 # Copyright (c) 2011 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.
 
 """code generator for GLES2 command buffers."""
 
 import os
 import os.path
@@ skipping 195 matching lines @@
 GL_APICALL void         GL_APIENTRY glSwapBuffers (void);
 GL_APICALL GLuint       GL_APIENTRY glGetMaxValueInBufferCHROMIUM (GLidBuffer buffer_id, GLsizei count, GLenumGetMaxIndexType type, GLuint offset);
 GL_APICALL void         GL_APIENTRY glGenSharedIdsCHROMIUM (GLuint namespace_id, GLuint id_offset, GLsizeiNotNegative n, GLuint* ids);
 GL_APICALL void         GL_APIENTRY glDeleteSharedIdsCHROMIUM (GLuint namespace_id, GLsizeiNotNegative n, const GLuint* ids);
 GL_APICALL void         GL_APIENTRY glRegisterSharedIdsCHROMIUM (GLuint namespace_id, GLsizeiNotNegative n, const GLuint* ids);
 GL_APICALL GLboolean    GL_APIENTRY glCommandBufferEnableCHROMIUM (const char* feature);
 GL_APICALL void*        GL_APIENTRY glMapBufferSubDataCHROMIUM (GLuint target, GLintptrNotNegative offset, GLsizeiptr size, GLenum access);
 GL_APICALL void         GL_APIENTRY glUnmapBufferSubDataCHROMIUM (const void* mem);
 GL_APICALL void*        GL_APIENTRY glMapTexSubImage2DCHROMIUM (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLenum access);
 GL_APICALL void         GL_APIENTRY glUnmapTexSubImage2DCHROMIUM (const void* mem);
-GL_APICALL void         GL_APIENTRY glCopyTextureToParentTextureCHROMIUM (GLidBindTexture client_child_id, GLidBindTexture client_parent_id);
 GL_APICALL void         GL_APIENTRY glResizeCHROMIUM (GLuint width, GLuint height);
 GL_APICALL const GLchar* GL_APIENTRY glGetRequestableExtensionsCHROMIUM (void);
 GL_APICALL void         GL_APIENTRY glRequestExtensionCHROMIUM (const char* extension);
 GL_APICALL void         GL_APIENTRY glRateLimitOffscreenContextCHROMIUM (void);
 GL_APICALL void         GL_APIENTRY glSetSurfaceCHROMIUM (GLint surface_id);
 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 void         GL_APIENTRY glPlaceholder451CHROMIUM (void);
+GL_APICALL void         GL_APIENTRY glPlaceholder452CHROMIUM (void);
 """
 
 # This is the list of all commmands that will be generated and their Id.
 # If a command is not listed in this table it is an error.
 # This lets us make sure that command ids do not change as the generator
 # generates new variations of commands.
 
 _CMD_ID_TABLE = {
   'ActiveTexture':                                             256,
   'AttachShader':                                              257,
@@ skipping 179 matching lines @@
   'ReleaseShaderCompiler':                                     437,
   'GetMaxValueInBufferCHROMIUM':                               438,
   'GenSharedIdsCHROMIUM':                                      439,
   'DeleteSharedIdsCHROMIUM':                                   440,
   'RegisterSharedIdsCHROMIUM':                                 441,
   'CommandBufferEnableCHROMIUM':                               442,
   'CompressedTexImage2DBucket':                                443,
   'CompressedTexSubImage2DBucket':                             444,
   'RenderbufferStorageMultisampleEXT':                         445,
   'BlitFramebufferEXT':                                        446,
-  'CopyTextureToParentTextureCHROMIUM':                        447,
+  'Placeholder447CHROMIUM':                                    447,
   'ResizeCHROMIUM':                                            448,
   'GetRequestableExtensionsCHROMIUM':                          449,
   'RequestExtensionCHROMIUM':                                  450,
+  'Placeholder451CHROMIUM':                                    451,
+  'Placeholder452CHROMIUM':                                    452,
   'SetSurfaceCHROMIUM':                                        453,
   'GetMultipleIntegervCHROMIUM':                               454,
   'GetProgramInfoCHROMIUM':                                    455,
 }
 
 # This is a list of enum names and their valid values. It is used to map
 # GLenum arguments to a specific set of valid values.
 _ENUM_LISTS = {
   'BlitFilter': {
     'type': 'GLenum',
@@ skipping 1278 matching lines @@
     'type': 'PUT',
     'data_type': 'GLfloat',
     'count': 4,
     'decoder_func': 'DoVertexAttrib4fv',
   },
   'VertexAttribPointer': {
       'type': 'Manual',
       'cmd_args': 'GLuint indx, GLint size, GLenum type, GLboolean normalized, '
                   'GLsizei stride, GLuint offset',
   },
-  'CopyTextureToParentTextureCHROMIUM': {
-      'impl_func': False,
-      'decoder_func': 'DoCopyTextureToParentTextureCHROMIUM',
-      'unit_test': False,
-      'extension': True,
-      'chromium': True,
-  },
   'ResizeCHROMIUM': {
       'decoder_func': 'DoResizeCHROMIUM',
       'unit_test': False,
       'extension': True,
       'chromium': True,
   },
   'GetRequestableExtensionsCHROMIUM': {
     'type': 'Custom',
     'impl_func': False,
     'immediate': False,
     'cmd_args': 'uint32 bucket_id',
     'extension': True,
     'chromium': True,
   },
   'RequestExtensionCHROMIUM': {
     'type': 'Custom',
     'impl_func': False,
     'immediate': False,
     'cmd_args': 'uint32 bucket_id',
     'extension': True,
     'chromium': True,
   },
   'RateLimitOffscreenContextCHROMIUM': {
     'gen_cmd': False,
     'extension': True,
     'chromium': True,
   },
+  'Placeholder447CHROMIUM': {
+    'type': 'UnknownCommand',
+  },
+  'Placeholder451CHROMIUM': {
+    'type': 'UnknownCommand',
+  },
+  'Placeholder452CHROMIUM': {
+    'type': 'UnknownCommand',
+  },
 }
 
 
 def SplitWords(input_string):
   """Transforms a input_string into a list of lower-case components.
 
   Args:
     input_string: the input string.
 
   Returns:
@@ skipping 505 matching lines @@
 
   def WriteGLES2ImplementationDeclaration(self, func, file):
     """Writes the GLES2 Implemention declaration."""
     impl_decl = func.GetInfo('impl_decl')
     if impl_decl == None or impl_decl == True:
       file.Write("%s %s(%s);\n" %
                  (func.return_type, func.original_name,
                   func.MakeTypedOriginalArgString("")))
       file.Write("\n")
 
+  def WriteGLES2CLibImplementation(self, func, file):
+    file.Write("%s GLES2%s(%s) {\n" %
+               (func.return_type, func.name,
+                func.MakeTypedOriginalArgString("")))
+    result_string = "return "
+    if func.return_type == "void":
+      result_string = ""
+    file.Write("  %sgles2::GetGLContext()->%s(%s);\n" %
+               (result_string, func.original_name,
+                func.MakeOriginalArgString("")))
+    file.Write("}\n")
+
   def WriteClientGLCallLog(self, func, file):
     """Writes a logging macro for the client side code."""
     comma = ""
     if len(func.GetOriginalArgs()):
       comma = " << "
     file.Write(
         '  GPU_CLIENT_LOG("[" << this << "] gl%s("%s%s << ")");\n' %
         (func.original_name, comma, func.MakeLogArgString()))
 
   def WriteClientGLReturnLog(self, func, file):
@@ skipping 2007 matching lines @@
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
   EXPECT_EQ(GL_INVALID_VALUE, GetGLError());
 }
 """
     self.WriteValidUnitTest(func, file, invalid_test)
 
   def WriteServiceImplementation(self, func, file):
     """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;
 
 class FunctionInfo(object):
   """Holds info about a function."""
 
   def __init__(self, info, type_handler):
     for key in info:
       setattr(self, key, info[key])
     self.type_handler = type_handler
     if not 'type' in info:
       self.type = ''
@@ skipping 747 matching lines @@
     self.type_handler.WriteCmdHelper(self, file)
 
   def WriteServiceImplementation(self, file):
     """Writes the service implementation for a command."""
     self.type_handler.WriteServiceImplementation(self, file)
 
   def WriteServiceUnitTest(self, file):
     """Writes the service implementation for a command."""
     self.type_handler.WriteServiceUnitTest(self, file)
 
+  def WriteGLES2CLibImplementation(self, file):
+    """Writes the GLES2 C Lib Implemention."""
+    self.type_handler.WriteGLES2CLibImplementation(self, file)
+
   def WriteGLES2ImplementationHeader(self, file):
     """Writes the GLES2 Implemention declaration."""
     self.type_handler.WriteGLES2ImplementationHeader(self, file)
 
   def WriteDestinationInitalizationValidation(self, file):
     """Writes the client side destintion initialization validation."""
     self.type_handler.WriteDestinationInitalizationValidation(self, file)
 
   def WriteFormatTest(self, file):
     """Writes the cmd's format test."""
@@ skipping 208 matching lines @@
       'GETn': GETnHandler(),
       'GLchar': GLcharHandler(),
       'HandWritten': HandWrittenHandler(),
       'Is': IsHandler(),
       'Manual': ManualHandler(),
       'PUT': PUTHandler(),
       'PUTn': PUTnHandler(),
       'PUTXn': PUTXnHandler(),
       'STRn': STRnHandler(),
       'Todo': TodoHandler(),
+      'UnknownCommand': UnknownCommandHandler(),
     }
 
     for func_name in _FUNCTION_INFO:
       info = _FUNCTION_INFO[func_name]
       type = ''
       if 'type' in info:
         type = info['type']
       self._function_info[func_name] = FunctionInfo(info,
                                                     self.GetTypeHandler(type))
 
@@ skipping 246 matching lines @@
       file.Close()
 
 
   def WriteGLES2CLibImplementation(self, filename):
     """Writes the GLES2 c lib implementation."""
     file = CHeaderWriter(
         filename,
         "// These functions emluate GLES2 over command buffers.\n")
 
     for func in self.original_functions:
-      file.Write("%s GLES2%s(%s) {\n" %
-                 (func.return_type, func.name,
-                  func.MakeTypedOriginalArgString("")))
-      result_string = "return "
-      if func.return_type == "void":
-        result_string = ""
-      file.Write("  %sgles2::GetGLContext()->%s(%s);\n" %
-                 (result_string, func.original_name,
-                  func.MakeOriginalArgString("")))
-      file.Write("}\n")
-
+      func.WriteGLES2CLibImplementation(file)
     file.Write("\n")
 
     file.Close()
 
   def WriteGLES2ImplementationHeader(self, filename):
     """Writes the GLES2 helper header."""
     file = CHeaderWriter(
         filename,
         "// This file is included by gles2_implementation.h to declare the\n"
         "// GL api functions.\n")
@@ skipping 357 matching lines @@
 
     if options.generate_docs:
       gen.WriteDocs("docs/gles2_cmd_format_docs_autogen.h")
 
   if gen.errors > 0:
     print "%d errors" % gen.errors
     sys.exit(1)
 
 if __name__ == '__main__':
   main(sys.argv[1:])