Remove unneeded shm versions of bucket functions from command buffer

gpu/command_buffer/build_gles2_cmd_buffer.py

 #!/usr/bin/env python
 # 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.
 
 """code generator for GLES2 command buffers."""
 
 import itertools
 import os
 import os.path
@@ skipping 1224 matching lines @@
 # type:         defines which handler will be used to generate code.
 # decoder_func: defines which function to call in the decoder to execute the
 #               corresponding GL command. If not specified the GL command will
 #               be called directly.
 # gl_test_func: GL function that is expected to be called when testing.
 # cmd_args:     The arguments to use for the command. This overrides generating
 #               them based on the GL function arguments.
 #               a NonImmediate type is a type that stays a pointer even in
 #               and immediate version of acommand.
 # gen_cmd:      Whether or not this function geneates a command. Default = True.
-# immediate:    Whether or not to generate an immediate command for the GL
-#               function. The default is if there is exactly 1 pointer argument
-#               in the GL function an immediate command is generated.
-# bucket:       True to generate a bucket version of the command.
+# data_transfer_methods: Array of methods that are used for transfering the
+#               pointer data.  Possible values: 'immediate', 'shm', 'bucket'.
+#               The default is 'immediate' if the command has one pointer
+#               argument, otherwise 'shm'. One command is generated for each
+#               transfer method. Affects only commands which are not of type
+#               'HandWritten', 'GETn' or 'GLcharN'.
+#               Note: the command arguments that affect this are the final args,
+#               taking cmd_args override into consideration.
 # impl_func:    Whether or not to generate the GLES2Implementation part of this
 #               command.
 # impl_decl:    Whether or not to generate the GLES2Implementation declaration
 #               for this command.
 # needs_size:   If true a data_size field is added to the command.
 # count:        The number of units per element. For PUTn or PUT types.
 # unit_test:    If False no service side unit test will be generated.
 # client_test:  If False no client side unit test will be generated.
 # expectation:  If False the unit test will have no expected calls.
 # gen_func:     Name of function that generates GL resource for corresponding
@@ skipping 24 matching lines @@
 _FUNCTION_INFO = {
   'ActiveTexture': {
     'decoder_func': 'DoActiveTexture',
     'unit_test': False,
     'impl_func': False,
     'client_test': False,
   },
   'AttachShader': {'decoder_func': 'DoAttachShader'},
   'BindAttribLocation': {
     'type': 'GLchar',
-    'bucket': True,
+    'data_transfer_methods': ['bucket'],
     'needs_size': True,
-    'immediate': False,
   },
   'BindBuffer': {
     'type': 'Bind',
     'decoder_func': 'DoBindBuffer',
     'gen_func': 'GenBuffersARB',
   },
   'BindFramebuffer': {
     'type': 'Bind',
     'decoder_func': 'DoBindFramebuffer',
     'gl_test_func': 'glBindFramebufferEXT',
@@ skipping 19 matching lines @@
     'unit_test': False,
     'extension_flag': 'chromium_framebuffer_multisample',
     'pepper_interface': 'FramebufferBlit',
     'pepper_name': 'BlitFramebufferEXT',
     'defer_reads': True,
     'defer_draws': True,
     'trace_level': 1,
   },
   'BufferData': {
     'type': 'Manual',
-    'immediate': False,
+    'data_transfer_methods': ['shm'],
     'client_test': False,
   },
   'BufferSubData': {
     'type': 'Data',
     'client_test': False,
     'decoder_func': 'DoBufferSubData',
-    'immediate': False,
+    'data_transfer_methods': ['shm'],
   },
   'CheckFramebufferStatus': {
     'type': 'Is',
     'decoder_func': 'DoCheckFramebufferStatus',
     'gl_test_func': 'glCheckFramebufferStatusEXT',
     'error_value': 'GL_FRAMEBUFFER_UNSUPPORTED',
     'result': ['GLenum'],
   },
   'Clear': {
     'decoder_func': 'DoClear',
@@ skipping 27 matching lines @@
     'unit_test': False,
     'client_test': False,
     'extension': True,
     'chromium': True,
     'trace_level': 1,
   },
   'CreateAndConsumeTextureCHROMIUM': {
     'decoder_func': 'DoCreateAndConsumeTextureCHROMIUM',
     'impl_func': False,
     'type': 'HandWritten',
+    'data_transfer_methods': ['immediate'],

[Kimmo Kinnunen, 2014/06/16 06:09:25]

Added this, see below for another comment..

     'unit_test': False,
     'client_test': False,
     'extension': True,
     'chromium': True,
   },
   'ClearStencil': {
     'type': 'StateSet',
     'state': 'ClearStencil',
   },
   'EnableFeatureCHROMIUM': {
     'type': 'Custom',
-    'immediate': False,
+    'data_transfer_methods': ['shm'],
     'decoder_func': 'DoEnableFeatureCHROMIUM',
     'expectation': False,
     'cmd_args': 'GLuint bucket_id, GLint* result',
     'result': ['GLint'],
     'extension': True,
     'chromium': True,
     'pepper_interface': 'ChromiumEnableFeature',
   },
   'CompileShader': {'decoder_func': 'DoCompileShader', 'unit_test': False},
   'CompressedTexImage2D': {
     'type': 'Manual',
-    'immediate': False,
-    'bucket': True,
+    'data_transfer_methods': ['bucket', 'shm'],
   },
   'CompressedTexSubImage2D': {
     'type': 'Data',
-    'bucket': True,
+    'data_transfer_methods': ['bucket', 'shm'],
     'decoder_func': 'DoCompressedTexSubImage2D',
-    'immediate': False,
   },
   'CopyTexImage2D': {
     'decoder_func': 'DoCopyTexImage2D',
     'unit_test': False,
     'defer_reads': True,
   },
   'CopyTexSubImage2D': {
     'decoder_func': 'DoCopyTexSubImage2D',
     'defer_reads': True,
   },
   'CreateImageCHROMIUM': {
     'type': 'Manual',
     'cmd_args':
         'GLsizei width, GLsizei height, GLenum internalformat, GLenum usage',
     'result': ['GLuint'],
     'client_test': False,
     'gen_cmd': False,
     'expectation': False,
     'extension': True,
     'chromium': True,
   },
   'DestroyImageCHROMIUM': {
     'type': 'Manual',
-    'immediate': False,
     'client_test': False,
     'gen_cmd': False,
     'extension': True,
     'chromium': True,
   },
   'GetImageParameterivCHROMIUM': {
     'type': 'Manual',
     'client_test': False,
     'gen_cmd': False,
     'expectation': False,
@@ skipping 93 matching lines @@
     'gl_test_func': 'glDeleteRenderbuffersEXT',
     'resource_type': 'Renderbuffer',
     'resource_types': 'Renderbuffers',
   },
   'DeleteShader': {'type': 'Delete', 'decoder_func': 'DoDeleteShader'},
   'DeleteSharedIdsCHROMIUM': {
     'type': 'Custom',
     'decoder_func': 'DoDeleteSharedIdsCHROMIUM',
     'impl_func': False,
     'expectation': False,
-    'immediate': False,
+    'data_transfer_methods': ['shm'],
     'extension': True,
     'chromium': True,
   },
   'DeleteTextures': {
     'type': 'DELn',
     'resource_type': 'Texture',
     'resource_types': 'Textures',
   },
   'DepthRangef': {
     'decoder_func': 'DoDepthRangef',
@@ skipping 70 matching lines @@
     'gl_test_func': 'glGenerateMipmapEXT',
   },
   'GenBuffers': {
     'type': 'GENn',
     'gl_test_func': 'glGenBuffersARB',
     'resource_type': 'Buffer',
     'resource_types': 'Buffers',
   },
   'GenMailboxCHROMIUM': {
     'type': 'HandWritten',
-    'immediate': False,
     'impl_func': False,
     'extension': True,
     'chromium': True,
   },
   'GenFramebuffers': {
     'type': 'GENn',
     'gl_test_func': 'glGenFramebuffersEXT',
     'resource_type': 'Framebuffer',
     'resource_types': 'Framebuffers',
   },
   'GenRenderbuffers': {
     'type': 'GENn', 'gl_test_func': 'glGenRenderbuffersEXT',
     'resource_type': 'Renderbuffer',
     'resource_types': 'Renderbuffers',
   },
   'GenTextures': {
     'type': 'GENn',
     'gl_test_func': 'glGenTextures',
     'resource_type': 'Texture',
     'resource_types': 'Textures',
   },
   'GenSharedIdsCHROMIUM': {
     'type': 'Custom',
     'decoder_func': 'DoGenSharedIdsCHROMIUM',
     'impl_func': False,
     'expectation': False,
-    'immediate': False,
+    'data_transfer_methods': ['shm'],
     'extension': True,
     'chromium': True,
   },
   'GetActiveAttrib': {
     'type': 'Custom',
-    'immediate': False,
+    'data_transfer_methods': ['shm'],
     'cmd_args':
         'GLidProgram program, GLuint index, uint32_t name_bucket_id, '
         'void* result',
     'result': [
       'int32_t success',
       'int32_t size',
       'uint32_t type',
     ],
   },
   'GetActiveUniform': {
     'type': 'Custom',
-    'immediate': False,
+    'data_transfer_methods': ['shm'],
     'cmd_args':
         'GLidProgram program, GLuint index, uint32_t name_bucket_id, '
         'void* result',
     'result': [
       'int32_t success',
       'int32_t size',
       'uint32_t type',
     ],
   },
   'GetAttachedShaders': {
     'type': 'Custom',
-    'immediate': False,
+    'data_transfer_methods': ['shm'],
     'cmd_args': 'GLidProgram program, void* result, uint32_t result_size',
     'result': ['SizedResult<GLuint>'],
   },
   'GetAttribLocation': {
     'type': 'HandWritten',
-    'immediate': False,
-    'bucket': True,
     'needs_size': True,
     'cmd_args':
         'GLidProgram program, const char* name, NonImmediate GLint* location',
     'result': ['GLint'],
     'error_return': -1, # http://www.opengl.org/sdk/docs/man/xhtml/glGetAttribLocation.xml
   },
   'GetBooleanv': {
     'type': 'GETn',
     'result': ['SizedResult<GLboolean>'],
     'decoder_func': 'DoGetBooleanv',
@@ skipping 36 matching lines @@
     'decoder_func': 'DoGetMaxValueInBufferCHROMIUM',
     'result': ['GLuint'],
     'unit_test': False,
     'client_test': False,
     'extension': True,
     'chromium': True,
     'impl_func': False,
   },
   'GetMultipleIntegervCHROMIUM': {
     'type': 'Custom',
-    'immediate': False,
+    'data_transfer_methods': ['shm'],
     'expectation': False,
     'extension': True,
     'chromium': True,
     'client_test': False,
   },
   'GetProgramiv': {
     'type': 'GETn',
     'decoder_func': 'DoGetProgramiv',
     'result': ['SizedResult<GLint>'],
     'expectation': False,
   },
   'GetProgramInfoCHROMIUM': {
     'type': 'Custom',
-    'immediate': False,
     'expectation': False,
     'impl_func': False,
     'extension': True,
     'chromium': True,
     'client_test': False,
     'cmd_args': 'GLidProgram program, uint32_t bucket_id',
     'result': [
       'uint32_t link_status',
       'uint32_t num_attribs',
       'uint32_t num_uniforms',
@@ skipping 15 matching lines @@
     'result': ['SizedResult<GLint>'],
   },
   'GetShaderInfoLog': {
     'type': 'STRn',
     'get_len_func': 'glGetShaderiv',
     'get_len_enum': 'GL_INFO_LOG_LENGTH',
     'unit_test': False,
   },
   'GetShaderPrecisionFormat': {
     'type': 'Custom',
-    'immediate': False,
+    'data_transfer_methods': ['shm'],
     'cmd_args':
       'GLenumShaderType shadertype, GLenumShaderPrecision precisiontype, '
       'void* result',
     'result': [
       'int32_t success',
       'int32_t min_range',
       'int32_t max_range',
       'int32_t precision',
     ],
   },
@@ skipping 21 matching lines @@
   },
   'GetTranslatedShaderSourceANGLE': {
     'type': 'STRn',
     'get_len_func': 'DoGetShaderiv',
     'get_len_enum': 'GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE',
     'unit_test': False,
     'extension': True,
     },
   'GetUniformfv': {
     'type': 'Custom',
-    'immediate': False,
+    'data_transfer_methods': ['shm'],
     'result': ['SizedResult<GLfloat>'],
   },
   'GetUniformiv': {
     'type': 'Custom',
-    'immediate': False,
+    'data_transfer_methods': ['shm'],
     'result': ['SizedResult<GLint>'],
   },
   'GetUniformLocation': {
     'type': 'HandWritten',
-    'immediate': False,
-    'bucket': True,
     'needs_size': True,
     'cmd_args':
         'GLidProgram program, const char* name, NonImmediate GLint* location',
     'result': ['GLint'],
     'error_return': -1, # http://www.opengl.org/sdk/docs/man/xhtml/glGetUniformLocation.xml
   },
   'GetVertexAttribfv': {
     'type': 'GETn',
     'result': ['SizedResult<GLfloat>'],
     'impl_decl': False,
     'decoder_func': 'DoGetVertexAttribfv',
     'expectation': False,
     'client_test': False,
   },
   'GetVertexAttribiv': {
     'type': 'GETn',
     'result': ['SizedResult<GLint>'],
     'impl_decl': False,
     'decoder_func': 'DoGetVertexAttribiv',
     'expectation': False,
     'client_test': False,
   },
   'GetVertexAttribPointerv': {
     'type': 'Custom',
-    'immediate': False,
+    'data_transfer_methods': ['shm'],
     'result': ['SizedResult<GLuint>'],
     'client_test': False,
   },
   'IsBuffer': {
     'type': 'Is',
     'decoder_func': 'DoIsBuffer',
     'expectation': False,
   },
   'IsEnabled': {
     'type': 'Is',
@@ skipping 111 matching lines @@
     'expectation': False,
     'unit_test': False,
     'extension_flag': 'multisampled_render_to_texture',
   },
   'ReadPixels': {
     'cmd_comment':
         '// ReadPixels has the result separated from the pixel buffer so that\n'
         '// it is easier to specify the result going to some specific place\n'
         '// that exactly fits the rectangle of pixels.\n',
     'type': 'Custom',
-    'immediate': False,
+    'data_transfer_methods': ['shm'],
     'impl_func': False,
     'client_test': False,
     'cmd_args':
         'GLint x, GLint y, GLsizei width, GLsizei height, '
         'GLenumReadPixelFormat format, GLenumReadPixelType type, '
         'uint32_t pixels_shm_id, uint32_t pixels_shm_offset, '
         'uint32_t result_shm_id, uint32_t result_shm_offset, '
         'GLboolean async',
     'result': ['uint32_t'],
     'defer_reads': True,
   },
   'RegisterSharedIdsCHROMIUM': {
     'type': 'Custom',
     'decoder_func': 'DoRegisterSharedIdsCHROMIUM',
     'impl_func': False,
     'expectation': False,
-    'immediate': False,
+    'data_transfer_methods': ['shm'],
     'extension': True,
     'chromium': True,
   },
   'ReleaseShaderCompiler': {
     'decoder_func': 'DoReleaseShaderCompiler',
     'unit_test': False,
   },
   'ShaderBinary': {
     'type': 'Custom',
     'client_test': False,
   },
   'ShaderSource': {
     'type': 'Manual',
-    'immediate': False,
-    'bucket': True,
+    'data_transfer_methods': ['bucket'],
     'needs_size': True,
     'client_test': False,
     'cmd_args':
         'GLuint shader, const char* data',
     'pepper_args':
         'GLuint shader, GLsizei count, const char** str, const GLint* length',
   },
   'StencilMask': {
     'type': 'StateSetFrontBack',
     'state': 'StencilMask',
     'no_gl': True,
     'expectation': False,
   },
   'StencilMaskSeparate': {
     'type': 'StateSetFrontBackSeparate',
     'state': 'StencilMask',
     'no_gl': True,
     'expectation': False,
   },
   'SwapBuffers': {
     'impl_func': False,
     'decoder_func': 'DoSwapBuffers',
     'unit_test': False,
     'client_test': False,
     'extension': True,
     'trace_level': 1,
   },
   'TexImage2D': {
     'type': 'Manual',
-    'immediate': False,
+    'data_transfer_methods': ['shm'],
     'client_test': False,
   },
   'TexParameterf': {
     'decoder_func': 'DoTexParameterf',
     'valid_args': {
       '2': 'GL_NEAREST'
     },
   },
   'TexParameteri': {
     'decoder_func': 'DoTexParameteri',
@@ skipping 12 matching lines @@
   'TexParameteriv': {
     'type': 'PUT',
     'data_value': 'GL_NEAREST',
     'count': 1,
     'decoder_func': 'DoTexParameteriv',
     'gl_test_func': 'glTexParameteri',
     'first_element_only': True,
   },
   'TexSubImage2D': {
     'type': 'Manual',
-    'immediate': False,
+    'data_transfer_methods': ['shm'],
     'client_test': False,
     'cmd_args': 'GLenumTextureTarget target, GLint level, '
                 'GLint xoffset, GLint yoffset, '
                 'GLsizei width, GLsizei height, '
                 'GLenumTextureFormat format, GLenumPixelType type, '
                 'const void* pixels, GLboolean internal'
   },
   'Uniform1f': {'type': 'PUTXn', 'count': 1},
   'Uniform1fv': {
     'type': 'PUTn',
@@ skipping 130 matching lines @@
   'ResizeCHROMIUM': {
       'type': 'Custom',
       'impl_func': False,
       'unit_test': False,
       'extension': True,
       'chromium': True,
   },
   'GetRequestableExtensionsCHROMIUM': {
     'type': 'Custom',
     'impl_func': False,
-    'immediate': False,
     'cmd_args': 'uint32_t bucket_id',
     'extension': True,
     'chromium': True,
   },
   'RequestExtensionCHROMIUM': {
     'type': 'Custom',
     'impl_func': False,
-    'immediate': False,
     'client_test': False,
     'cmd_args': 'uint32_t bucket_id',
     'extension': True,
     'chromium': True,
   },
   'RateLimitOffscreenContextCHROMIUM': {
     'gen_cmd': False,
     'extension': True,
     'chromium': True,
     'client_test': False,
   },
   'CreateStreamTextureCHROMIUM':  {
     'type': 'HandWritten',
     'impl_func': False,
     'gen_cmd': False,
-    'immediate': False,
     'extension': True,
     'chromium': True,
   },
   'TexImageIOSurface2DCHROMIUM': {
     'decoder_func': 'DoTexImageIOSurface2DCHROMIUM',
     'unit_test': False,
     'extension': True,
     'chromium': True,
   },
   'CopyTextureCHROMIUM': {
@@ skipping 61 matching lines @@
     'pepper_interface': 'Query',
   },
   'IsQueryEXT': {
     'gen_cmd': False,
     'client_test': False,
     'pepper_interface': 'Query',
   },
   'BeginQueryEXT': {
     'type': 'Manual',
     'cmd_args': 'GLenumQueryTarget target, GLidQuery id, void* sync_data',
-    'immediate': False,
+    'data_transfer_methods': ['shm'],
     'gl_test_func': 'glBeginQuery',
     'pepper_interface': 'Query',
   },
   'EndQueryEXT': {
     'type': 'Manual',
     'cmd_args': 'GLenumQueryTarget target, GLuint submit_count',
     'gl_test_func': 'glEndnQuery',
     'client_test': False,
     'pepper_interface': 'Query',
   },
   'GetQueryivEXT': {
     'gen_cmd': False,
     'client_test': False,
     'gl_test_func': 'glGetQueryiv',
     'pepper_interface': 'Query',
   },
   'GetQueryObjectuivEXT': {
     'gen_cmd': False,
     'client_test': False,
     'gl_test_func': 'glGetQueryObjectuiv',
     'pepper_interface': 'Query',
   },
   'BindUniformLocationCHROMIUM': {
     'type': 'GLchar',
     'extension': True,
-    'bucket': True,
+    'data_transfer_methods': ['bucket'],
     'needs_size': True,
     'gl_test_func': 'DoBindUniformLocationCHROMIUM',
-    'immediate': False,
   },
   'InsertEventMarkerEXT': {
     'type': 'GLcharN',
     'decoder_func': 'DoInsertEventMarkerEXT',
     'expectation': False,
     'extension': True,
   },
   'PushGroupMarkerEXT': {
     'type': 'GLcharN',
     'decoder_func': 'DoPushGroupMarkerEXT',
@@ skipping 62 matching lines @@
   'ShallowFlushCHROMIUM': {
     'impl_func': False,
     'gen_cmd': False,
     'extension': True,
     'chromium': True,
     'client_test': False,
   },
   'TraceBeginCHROMIUM': {
     'type': 'Custom',
     'impl_func': False,
-    'immediate': False,
     'client_test': False,
     'cmd_args': 'GLuint bucket_id',
     'extension': True,
     'chromium': True,
   },
   'TraceEndCHROMIUM': {
     'impl_func': False,
-    'immediate': False,
     'client_test': False,
     'decoder_func': 'DoTraceEndCHROMIUM',
     'unit_test': False,
     'extension': True,
     'chromium': True,
   },
   'AsyncTexImage2DCHROMIUM': {
     'type': 'Manual',
-    'immediate': False,
+    'data_transfer_methods': ['shm'],
     'client_test': False,
     'cmd_args': 'GLenumTextureTarget target, GLint level, '
         'GLintTextureInternalFormat internalformat, '
         'GLsizei width, GLsizei height, '
         'GLintTextureBorder border, '
         'GLenumTextureFormat format, GLenumPixelType type, '
         'const void* pixels, '
         'uint32_t async_upload_token, '
         'void* sync_data',
     'extension': True,
     'chromium': True,
   },
   'AsyncTexSubImage2DCHROMIUM': {
     'type': 'Manual',
-    'immediate': False,
+    'data_transfer_methods': ['shm'],
     'client_test': False,
     'cmd_args': 'GLenumTextureTarget target, GLint level, '
         'GLint xoffset, GLint yoffset, '
         'GLsizei width, GLsizei height, '
         'GLenumTextureFormat format, GLenumPixelType type, '
         'const void* data, '
         'uint32_t async_upload_token, '
         'void* sync_data',
     'extension': True,
     'chromium': True,
   },
   'WaitAsyncTexImage2DCHROMIUM': {
     'type': 'Manual',
-    'immediate': False,
     'client_test': False,
     'extension': True,
     'chromium': True,
   },
   'WaitAllAsyncTexImage2DCHROMIUM': {
     'type': 'Manual',
-    'immediate': False,
     'client_test': False,
     'extension': True,
     'chromium': True,
   },
   'DiscardFramebufferEXT': {
     'type': 'PUTn',
     'count': 1,
     'cmd_args': 'GLenum target, GLsizei count, '
         'const GLenum* attachments',
     'decoder_func': 'DoDiscardFramebufferEXT',
@@ skipping 160 matching lines @@
   _remove_expected_call_re = re.compile(r'  EXPECT_CALL.*?;\n', re.S)
 
   def __init__(self):
     pass
 
   def InitFunction(self, func):
     """Add or adjust anything type specific for this function."""
     if func.GetInfo('needs_size') and not func.name.endswith('Bucket'):
       func.AddCmdArg(DataSizeArgument('data_size'))
 
-  def AddImmediateFunction(self, generator, func):
-    """Adds an immediate version of a function."""
-    # Generate an immediate command if there is only 1 pointer arg.
-    immediate = func.GetInfo('immediate')  # can be True, False or None
-    if immediate == True or immediate == None:
-      if func.num_pointer_args == 1 or immediate:
-        generator.AddFunction(ImmediateFunction(func))
-        return True
-
-  def AddBucketFunction(self, generator, func):
-    """Adds a bucket version of a function."""
-    # Generate an immediate command if there is only 1 pointer arg.
-    bucket = func.GetInfo('bucket')  # can be True, False or None
-    if bucket:
-      generator.AddFunction(BucketFunction(func))
+  def NeedsDataTransferFunction(self, func):
+    """Overriden from TypeHandler."""
+    return func.num_pointer_args >= 1
 
   def WriteStruct(self, func, file):
     """Writes a structure that matches the arguments to a function."""
     comment = func.GetInfo('cmd_comment')
     if not comment == None:
       file.Write(comment)
     file.Write("struct %s {\n" % func.name)
     file.Write("  typedef %s ValueType;\n" % func.name)
     file.Write("  static const CommandId kCmdId = k%s;\n" % func.name)
     func.WriteCmdArgFlag(file)
@@ skipping 834 matching lines @@
     file.Write("    static_cast<ValueType*>(cmd)->Init(%s);\n" % copy_args)
     file.Write("    return NextImmediateCmdAddressTotalSize<ValueType>("
                "cmd, total_size);\n")
     file.Write("  }\n")
     file.Write("\n")
 
 
 class TodoHandler(CustomHandler):
   """Handle for commands that are not yet implemented."""
 
-  def AddImmediateFunction(self, generator, func):
-    """Overrriden from TypeHandler."""
-    pass
+  def NeedsDataTransferFunction(self, func):
+    """Overriden from TypeHandler."""
+    return False
 
   def WriteImmediateFormatTest(self, func, file):
     """Overrriden from TypeHandler."""
     pass
 
   def WriteGLES2ImplementationUnitTest(self, func, file):
     """Overrriden from TypeHandler."""
     pass
 
   def WriteGLES2Implementation(self, func, file):
@@ skipping 29 matching lines @@
 
 
 class HandWrittenHandler(CustomHandler):
   """Handler for comands where everything must be written by hand."""
 
   def InitFunction(self, func):
     """Add or adjust anything type specific for this function."""
     CustomHandler.InitFunction(self, func)
     func.can_auto_generate = False
 
+  def NeedsDataTransferFunction(self, func):
+    """Overriden from TypeHandler."""
+    # If specified explicitly, force the data transfer method.
+    if func.GetInfo('data_transfer_methods'):
+      return True

[Kimmo Kinnunen, 2014/06/16 06:09:25]

Had to add this in order to support correct ...Immediate -suffix to generated
code for CreateAndConsumeTextureCHROMIUM

+    return False
+
   def WriteStruct(self, func, file):
     """Overrriden from TypeHandler."""
     pass
 
   def WriteDocs(self, func, file):
     """Overrriden from TypeHandler."""
     pass
 
   def WriteServiceUnitTest(self, func, file):
     """Overrriden from TypeHandler."""
@@ skipping 949 matching lines @@
     file.Write("}\n")
     file.Write("\n")
 
 
 class GETnHandler(TypeHandler):
   """Handler for GETn for glGetBooleanv, glGetFloatv, ... type functions."""
 
   def __init__(self):
     TypeHandler.__init__(self)
 
-  def AddImmediateFunction(self, generator, func):
-    """Overrriden from TypeHandler."""
-    pass
+  def NeedsDataTransferFunction(self, func):
+    """Overriden from TypeHandler."""
+    return False
 
   def WriteServiceImplementation(self, func, file):
     """Overrriden from TypeHandler."""
     file.Write(
         "error::Error GLES2DecoderImpl::Handle%s(\n" % func.name)
     file.Write(
         "    uint32_t immediate_data_size, const gles2::cmds::%s& c) {\n" %
         func.name)
     last_arg = func.GetLastOriginalArg()
 
@@ skipping 983 matching lines @@
   """Handler for functions that pass a single string with an optional len."""
 
   def __init__(self):
     CustomHandler.__init__(self)
 
   def InitFunction(self, func):
     """Overrriden from TypeHandler."""
     func.cmd_args = []
     func.AddCmdArg(Argument('bucket_id', 'GLuint'))
 
-  def AddImmediateFunction(self, generator, func):
-    """Overrriden from TypeHandler."""
-    pass
+  def NeedsDataTransferFunction(self, func):
+    """Overriden from TypeHandler."""
+    return False
 
   def AddBucketFunction(self, generator, func):
     """Overrriden from TypeHandler."""
     pass
 
   def WriteServiceImplementation(self, func, file):
     """Overrriden from TypeHandler."""
     file.Write("""error::Error GLES2DecoderImpl::Handle%(name)s(
   uint32_t immediate_data_size, const gles2::cmds::%(name)s& c) {
   GLuint bucket_id = static_cast<GLuint>(c.%(bucket_id)s);
@@ skipping 1135 matching lines @@
   def GetGLTestFunctionName(self):
     gl_func_name = self.GetInfo('gl_test_func')
     if gl_func_name == None:
       gl_func_name = self.GetGLFunctionName()
     if gl_func_name.startswith("gl"):
       gl_func_name = gl_func_name[2:]
     else:
       gl_func_name = self.original_name
     return gl_func_name
 
+  def GetDataTransferMethods(self):
+    return self.GetInfo('data_transfer_methods',
+                        ['immediate' if self.num_pointer_args == 1 else 'shm'])
+
   def AddCmdArg(self, arg):
     """Adds a cmd argument to this function."""
     self.cmd_args.append(arg)
 
   def GetCmdArgs(self):
     """Gets the command args for this function."""
     return self.cmd_args
 
   def ClearCmdArgs(self):
     """Clears the command args for this function."""
@@ skipping 534 matching lines @@
 
         f = Function(func_name, func_info)
         self.original_functions.append(f)
 
         #for arg in f.GetOriginalArgs():
         #  if not isinstance(arg, EnumArgument) and arg.type == 'GLenum':
         #    self.Log("%s uses bare GLenum %s." % (func_name, arg.name))
 
         gen_cmd = f.GetInfo('gen_cmd')
         if gen_cmd == True or gen_cmd == None:
-          if not f.type_handler.AddImmediateFunction(self, f):
+          if f.type_handler.NeedsDataTransferFunction(f):
+            methods = f.GetDataTransferMethods()
+            if 'immediate' in methods:
+              self.AddFunction(ImmediateFunction(f))
+            if 'bucket' in methods:
+              self.AddFunction(BucketFunction(f))
+            if 'shm' in methods:
+              self.AddFunction(f)
+          else:
             self.AddFunction(f)
-          f.type_handler.AddBucketFunction(self, f)
 
     self.Log("Auto Generated Functions    : %d" %
              len([f for f in self.functions if f.can_auto_generate or
                   (not f.IsType('') and not f.IsType('Custom') and
                    not f.IsType('Todo'))]))
 
     funcs = [f for f in self.functions if not f.can_auto_generate and
              (f.IsType('') or f.IsType('Custom') or f.IsType('Todo'))]
     self.Log("Non Auto Generated Functions: %d" % len(funcs))
 
@@ skipping 1009 matching lines @@
       "ppapi/shared_impl/ppb_opengles2_shared.cc"])
 
   if gen.errors > 0:
     print "%d errors" % gen.errors
     return 1
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))