Add Immediate command data size validation....

gpu/command_buffer/build_gles2_cmd_buffer.py

 #!/usr/bin/python
 #
 # Copyright (c) 2006-2009 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 GL command buffers."""
 
 import os
 import os.path
@@ skipping 645 matching lines @@
   'CompressedTexSubImage2D': {'type': 'Data'},
   'CreateProgram': {'type': 'Create'},
   'CreateShader': {'type': 'Create'},
   'DeleteBuffers': {'type': 'DELn'},
   'DeleteFramebuffers': {'type': 'DELn'},
   'DeleteProgram': {'type': 'Custom', 'DecoderFunc': 'DoDeleteProgram'},
   'DeleteRenderbuffers': {'type': 'DELn'},
   'DeleteShader': {'type': 'Custom', 'DecoderFunc': 'DoDeleteShader'},
   'DeleteTextures': {'type': 'DELn'},
   'DepthRangef': {'DecoderFunc': 'glDepthRange'},
+  'DisableVertexAttribArray': {'DecoderFunc': 'DoDisableVertexAttribArray'},
+  'DrawArrays': { 'DecoderFunc': 'DoDrawArrays'},
   'DrawElements': {
     'type': 'Manual',
     'cmd_args': 'GLenum mode, GLsizei count, GLenum type, GLuint index_offset',
   },
+  'EnableVertexAttribArray': {'DecoderFunc': 'DoEnableVertexAttribArray'},
   'FramebufferRenderbuffer': {'DecoderFunc': 'glFramebufferRenderbufferEXT'},
   'FramebufferTexture2D': {'DecoderFunc': 'glFramebufferTexture2DEXT'},
   'GenerateMipmap': {'DecoderFunc': 'glGenerateMipmapEXT'},
   'GenBuffers': {'type': 'GENn'},
   'GenFramebuffers': {'type': 'GENn'},
   'GenRenderbuffers': {'type': 'GENn'},
   'GenTextures': {'type': 'GENn'},
   'GetActiveAttrib': {'type': 'Custom'},
   'GetActiveUniform': {'type': 'Custom'},
   'GetAttachedShaders': {'type': 'Custom'},
@@ skipping 37 matching lines @@
   'GetVertexAttribfv': {'type': 'GETn'},
   'GetVertexAttribiv': {'type': 'GETn'},
   'GetVertexAttribPointerv': {'type': 'Custom', 'immediate': False},
   'IsBuffer': {'type': 'Is'},
   'IsEnabled': {'type': 'Is'},
   'IsFramebuffer': {'type': 'Is', 'DecoderFunc': 'glIsFramebufferEXT'},
   'IsProgram': {'type': 'Is'},
   'IsRenderbuffer': {'type': 'Is', 'DecoderFunc': 'glIsRenderbufferEXT'},
   'IsShader': {'type': 'Is'},
   'IsTexture': {'type': 'Is'},
+  'LinkProgram': {'DecoderFunc': 'DoLinkProgram'},
   'PixelStorei': {'type': 'Manual'},
   'RenderbufferStorage': {'DecoderFunc': 'glRenderbufferStorageEXT'},
   'ReadPixels': {'type': 'Custom', 'immediate': False},
   'ReleaseShaderCompiler': {'type': 'Noop'},
   'ShaderBinary': {'type': 'Noop'},
   'ShaderSource': {
     'type': 'Manual',
     'immediate': True,
     'needs_size': True,
     'cmd_args':
         'GLuint shader, GLsizei count, const char* data',
   },
   'TexImage2D': {'type': 'Manual', 'immediate': True},
   'TexParameterfv': {'type': 'PUT', 'data_type': 'GLfloat', 'count': 1},
   'TexParameteriv': {'type': 'PUT', 'data_type': 'GLint', 'count': 1},
   'TexSubImage2D': {'type': 'Data'},
   'Uniform1fv': {'type': 'PUTn', 'data_type': 'GLfloat', 'count': 1},
   'Uniform1iv': {'type': 'PUTn', 'data_type': 'GLint', 'count': 1},
   'Uniform2fv': {'type': 'PUTn', 'data_type': 'GLfloat', 'count': 2},
   'Uniform2iv': {'type': 'PUTn', 'data_type': 'GLint', 'count': 2},
   'Uniform3fv': {'type': 'PUTn', 'data_type': 'GLfloat', 'count': 3},
   'Uniform3iv': {'type': 'PUTn', 'data_type': 'GLint', 'count': 3},
   'Uniform4fv': {'type': 'PUTn', 'data_type': 'GLfloat', 'count': 4},
   'Uniform4iv': {'type': 'PUTn', 'data_type': 'GLint', 'count': 4},
   'UniformMatrix2fv': {'type': 'PUTn', 'data_type': 'GLfloat', 'count': 4},
   'UniformMatrix3fv': {'type': 'PUTn', 'data_type': 'GLfloat', 'count': 9},
   'UniformMatrix4fv': {'type': 'PUTn', 'data_type': 'GLfloat', 'count': 16},
+  'UseProgram': {'DecoderFunc': 'DoUseProgram'},
   'VertexAttrib1fv': {'type': 'PUT', 'data_type': 'GLfloat', 'count': 1},
   'VertexAttrib2fv': {'type': 'PUT', 'data_type': 'GLfloat', 'count': 2},
   'VertexAttrib3fv': {'type': 'PUT', 'data_type': 'GLfloat', 'count': 3},
   'VertexAttrib4fv': {'type': 'PUT', 'data_type': 'GLfloat', 'count': 4},
   'VertexAttribPointer': {
       'type': 'Manual',
       'cmd_args': 'GLuint indx, GLint size, GLenum type, GLboolean normalized, '
                   'GLsizei stride, GLuint offset',
   },
   'SwapBuffers': {'DecoderFunc': 'DoSwapBuffers'},
@@ skipping 170 matching lines @@
     func.type_handler.WriteImmediateCmdSizeTest(func, file)
     file.Write("  EXPECT_EQ(static_cast<char*>(next_cmd),\n")
     file.Write("            reinterpret_cast<char*>(&cmd) + sizeof(cmd));\n");
     for arg in args:
       file.Write("  EXPECT_EQ(static_cast<%s>(%d), cmd.%s);\n" %
                  (arg.type, value, arg.name))
       value += 1
     file.Write("}\n")
     file.Write("\n")
 
+  def WriteGetDataSizeCode(self, func, file):
+    """Writes the code to set data_size used in validation"""
+    pass
+
   def WriteImmediateCmdSizeTest(self, func, file):
     """Writes a size test for an immediate version of a command."""
     file.Write("  // TODO(gman): Compute correct size.\n")
     file.Write("  EXPECT_EQ(sizeof(cmd), cmd.header.size * 4u);\n")
 
   def WriteImmediateHandlerImplementation (self, func, file):
     """Writes the handler impl for the immediate version of a command."""
-    file.Write("  // Immediate version.\n")
-    func.WriteHandlerValidation(file)
     file.Write("  %s(%s);\n" %
                (func.GetGLFunctionName(), func.MakeOriginalArgString("")))
 
   def WriteServiceImplementation(self, func, file):
     """Writes the service implementation for a command."""
     file.Write(
         "parse_error::ParseError GLES2DecoderImpl::Handle%s(\n" % func.name)
     file.Write(
         "    uint32 immediate_data_size, const gles2::%s& c) {\n" % func.name)
-    for arg in func.GetOriginalArgs():
-      arg.WriteGetCode(file)
+    if len(func.GetOriginalArgs()) > 0:
+      last_arg = func.GetLastOriginalArg()
+      all_but_last_arg = func.GetOriginalArgs()[:-1]
+      for arg in all_but_last_arg:
+        arg.WriteGetCode(file)
+      self.WriteGetDataSizeCode(func, file)
+      last_arg.WriteGetCode(file)
     func.WriteHandlerValidation(file)
     func.WriteHandlerImplementation(file)
     file.Write("  return parse_error::kParseNoError;\n")
     file.Write("}\n")
     file.Write("\n")
 
   def WriteImmediateServiceImplementation(self, func, file):
     """Writes the service implementation for an immediate version of command."""
     file.Write(
         "parse_error::ParseError GLES2DecoderImpl::Handle%s(\n" % func.name)
     file.Write(
         "    uint32 immediate_data_size, const gles2::%s& c) {\n" % func.name)
-    for arg in func.GetOriginalArgs():
+    last_arg = func.GetLastOriginalArg()
+    all_but_last_arg = func.GetOriginalArgs()[:-1]
+    for arg in all_but_last_arg:
       arg.WriteGetCode(file)
+    self.WriteGetDataSizeCode(func, file)
+    last_arg.WriteGetCode(file)
     func.WriteHandlerValidation(file)
     func.WriteHandlerImplementation(file)
     file.Write("  return parse_error::kParseNoError;\n")
     file.Write("}\n")
     file.Write("\n")
 
   def WriteImmediateValidationCode(self, func, file):
     """Writes the validation code for an immediate version of a command."""
     pass
 
@@ skipping 204 matching lines @@
 
   def WriteImmediateCmdGetTotalSize(self, func, file):
     """Overrriden from TypeHandler."""
     # TODO(gman): Move this data to _FUNCTION_INFO?
     if func.name == 'ShaderSourceImmediate':
       file.Write("    uint32 total_size = ComputeSize(_data_size);\n")
     else:
       CustomHandler.WriteImmediateCmdGetTotalSize(self, func, file)
 
 
-class DataHandler(CustomHandler):
+class DataHandler(TypeHandler):
   """Handler for glBufferData, glBufferSubData, glTexImage2D, glTexSubImage2D,
      glCompressedTexImage2D, glCompressedTexImageSub2D."""
   def __init__(self):
-    CustomHandler.__init__(self)
+    TypeHandler.__init__(self)
 
-  def WriteServiceImplementation(self, func, file):
+  def WriteGetDataSizeCode(self, func, file):
     """Overrriden from TypeHandler."""
-    file.Write(
-        "parse_error::ParseError GLES2DecoderImpl::Handle%s(\n" % func.name)
-    file.Write(
-        "    uint32 immediate_data_size, const gles2::%s& c) {\n" % func.name)
-    for arg in func.GetCmdArgs():
-      arg.WriteGetCode(file)
-
     # TODO(gman): Move this data to _FUNCTION_INFO?
-    if func.name == 'BufferData':
+    name = func.name
+    if name.endswith("Immediate"):
+      name = name[0:-9]
+    if name == 'BufferData':
       file.Write("  uint32 data_size = size;\n")
-    elif func.name == 'BufferSubData':
+    elif name == 'BufferSubData':
       file.Write("  uint32 data_size = size;\n")
-    elif func.name == 'CompressedTexImage2D':
+    elif name == 'CompressedTexImage2D':
       file.Write("  uint32 data_size = imageSize;\n")
-    elif func.name == 'CompressedTexSubImage2D':
+    elif name == 'CompressedTexSubImage2D':
       file.Write("  uint32 data_size = imageSize;\n")
-    elif func.name == 'TexImage2D':
-      file.Write("  uint32 pixels_size = GLES2Util::ComputeImageDataSize(\n")
+    elif name == 'TexImage2D':
+      file.Write("  uint32 data_size = GLES2Util::ComputeImageDataSize(\n")
       file.Write("      width, height, format, type, unpack_alignment_);\n")
-    elif func.name == 'TexSubImage2D':
-      file.Write("  uint32 pixels_size = GLES2Util::ComputeImageDataSize(\n")
+    elif name == 'TexSubImage2D':
+      file.Write("  uint32 data_size = GLES2Util::ComputeImageDataSize(\n")
       file.Write("      width, height, format, type, unpack_alignment_);\n")
     else:
-      file.Write("  uint32 data_size = 0;  // TODO(gman): get correct size!\n")
-
-    for arg in func.GetOriginalArgs():
-      arg.WriteGetAddress(file)
-    func.WriteHandlerValidation(file)
-    func.WriteHandlerImplementation(file)
-    file.Write("  return parse_error::kParseNoError;\n")
-    file.Write("}\n")
-    file.Write("\n")
+      file.Write("// uint32 data_size = 0;  // TODO(gman): get correct size!\n")
 
   def WriteImmediateCmdGetTotalSize(self, func, file):
     """Overrriden from TypeHandler."""
     # TODO(gman): Move this data to _FUNCTION_INFO?
     if func.name == 'BufferDataImmediate':
       file.Write("    uint32 total_size = ComputeSize(_size);\n")
     elif func.name == 'BufferSubDataImmediate':
         file.Write("    uint32 total_size = ComputeSize(_size);\n")
     elif func.name == 'CompressedTexImage2DImmediate':
         file.Write("    uint32 total_size = ComputeSize(_imageSize);\n")
@@ skipping 18 matching lines @@
     elif func.name == 'CompressedTexSubImage2DImmediate':
         file.Write("    uint32 total_size = cmd.ComputeSize(cmd.imageSize);\n")
     elif func.name == 'TexImage2DImmediate':
       file.Write(
           "    uint32 total_size = 0;  // TODO(gman): get correct size\n")
     elif func.name == 'TexSubImage2DImmediate':
       file.Write(
           "    uint32 total_size = 0;  // TODO(gman): get correct size\n")
     file.Write("  EXPECT_EQ(sizeof(cmd), total_size);\n")
 
+  def WriteImmediateCmdInit(self, func, file):
+    """Overrriden from TypeHandler."""
+    file.Write("  void Init(%s) {\n" % func.MakeTypedCmdArgString("_"))
+    self.WriteImmediateCmdGetTotalSize(func, file)
+    file.Write("    SetHeader(total_size);\n")
+    args = func.GetCmdArgs()
+    for arg in args:
+      file.Write("    %s = _%s;\n" % (arg.name, arg.name))
+    file.Write("  }\n")
+    file.Write("\n")
+
+  def WriteImmediateCmdSet(self, func, file):
+    """Overrriden from TypeHandler."""
+    copy_args = func.MakeCmdArgString("_", False)
+    file.Write("  void* Set(void* cmd%s) {\n" %
+               func.MakeTypedCmdArgString("_", True))
+    self.WriteImmediateCmdGetTotalSize(func, file)
+    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")
+
   def WriteImmediateFormatTest(self, func, file):
     """Overrriden from TypeHandler."""
     # TODO(gman): Remove this exception.
     file.Write("// TODO(gman): Implement test for %s\n" % func.name)
     return
 
   def WriteGLES2ImplementationImpl(self, func, file):
     """Overrriden from TypeHandler."""
     pass
 
 
 class GENnHandler(TypeHandler):
   """Handler for glGen___ type functions."""
 
   def __init__(self):
     TypeHandler.__init__(self)
 
   def InitFunction(self, func):
     """Overrriden from TypeHandler."""
     pass
 
+  def WriteGetDataSizeCode(self, func, file):
+    """Overrriden from TypeHandler."""
+    file.Write("  uint32 data_size = n * sizeof(GLuint);\n")
+
   def WriteHandlerImplementation (self, func, file):
     """Overrriden from TypeHandler."""
-    func.WriteHandlerValidation(file)
     file.Write("  GenGLObjects<GL%sHelper>(n, %s);\n" %
                (func.name, func.GetLastOriginalArg().name))
 
   def WriteImmediateHandlerImplementation(self, func, file):
     """Overrriden from TypeHandler."""
-    func.WriteHandlerValidation(file)
     file.Write("  GenGLObjects<GL%sHelper>(n, %s);\n" %
                (func.original_name, func.GetLastOriginalArg().name))
 
   def WriteGLES2ImplementationHeader(self, func, file):
     """Overrriden from TypeHandler."""
     file.Write("%s %s(%s) {\n" %
                (func.return_type, func.original_name,
                 func.MakeTypedOriginalArgString("")))
     file.Write("  MakeIds(%s);\n" % func.MakeOriginalArgString(""))
     file.Write("  helper_->%sImmediate(%s);\n" %
@@ skipping 108 matching lines @@
   def __init__(self):
     TypeHandler.__init__(self)
 
   def InitFunction(self, func):
     """Overrriden from TypeHandler."""
     func.AddCmdArg(Argument("client_id", 'uint32'))
 
   def WriteHandlerImplementation (self, func, file):
     """Overrriden from TypeHandler."""
     file.Write("  uint32 client_id = c.client_id;\n")
-    func.WriteHandlerValidation(file)
     file.Write("  %sHelper(%s);\n" %
                (func.name, func.MakeCmdArgString("")))
 
   def WriteGLES2ImplementationHeader(self, func, file):
     """Overrriden from TypeHandler."""
     file.Write("%s %s(%s) {\n" %
                (func.return_type, func.original_name,
                 func.MakeTypedOriginalArgString("")))
     file.Write("  GLuint client_id;\n")
     file.Write("  MakeIds(1, &client_id);\n")
     file.Write("  helper_->%s(%s);\n" %
                (func.name, func.MakeCmdArgString("")))
     file.Write("  return client_id;\n")
     file.Write("}\n")
     file.Write("\n")
 
   def WriteGLES2ImplementationImpl(self, func, file):
     """Overrriden from TypeHandler."""
     pass
 
 
 class DELnHandler(TypeHandler):
   """Handler for glDelete___ type functions."""
 
   def __init__(self):
     TypeHandler.__init__(self)
 
+  def WriteGetDataSizeCode(self, func, file):
+    """Overrriden from TypeHandler."""
+    file.Write("  uint32 data_size = n * sizeof(GLuint);\n")
+
   def WriteHandlerImplementation (self, func, file):
     """Overrriden from TypeHandler."""
-    func.WriteHandlerValidation(file)
     file.Write("  DeleteGLObjects<GL%sHelper>(n, %s);\n" %
                (func.name, func.GetLastOriginalArg().name))
 
   def WriteImmediateHandlerImplementation (self, func, file):
     """Overrriden from TypeHandler."""
-    func.WriteHandlerValidation(file)
     file.Write("  DeleteGLObjects<GL%sHelper>(n, %s);\n" %
                (func.original_name, func.GetLastOriginalArg().name))
 
   def WriteGLES2ImplementationHeader(self, func, file):
     """Overrriden from TypeHandler."""
     file.Write("%s %s(%s) {\n" %
                (func.return_type, func.original_name,
                 func.MakeTypedOriginalArgString("")))
     file.Write("  FreeIds(%s);\n" % func.MakeOriginalArgString(""))
     file.Write("  helper_->%sImmediate(%s);\n" %
@@ skipping 158 matching lines @@
     """Overrriden from TypeHandler."""
     pass
 
 
 class PUTHandler(TypeHandler):
   """Handler for glTexParameter_v, glVertexAttrib_v functions."""
 
   def __init__(self):
     TypeHandler.__init__(self)
 
-  def WriteImmediateValidationCode(self, func, file):
+  def WriteGetDataSizeCode(self, func, file):
     """Overrriden from TypeHandler."""
-    file.Write("  if (!CheckImmediateDataSize<%s>("
-               "immediate_data_size, 1, sizeof(%s), %d)) {\n" %
-               (func.name, func.info.data_type, func.info.count))
-    file.Write("    return parse_error::kParseOutOfBounds;\n")
-    file.Write("  }\n")
+    file.Write("  uint32 data_size = ComputeImmediateDataSize("
+               "immediate_data_size, 1, sizeof(%s), %d);\n" %
+               (func.info.data_type, func.info.count))
 
   def WriteGLES2ImplementationHeader(self, func, file):
     """Overrriden from TypeHandler."""
     file.Write("%s %s(%s) {\n" %
                (func.return_type, func.original_name,
                 func.MakeTypedOriginalArgString("")))
     file.Write("  helper_->%sImmediate(%s);\n" %
                (func.name, func.MakeOriginalArgString("")))
     file.Write("}\n")
     file.Write("\n")
@@ skipping 106 matching lines @@
     file.Write("}\n")
     file.Write("\n")
 
 
 class PUTnHandler(TypeHandler):
   """Handler for PUTn 'glUniform__v' type functions."""
 
   def __init__(self):
     TypeHandler.__init__(self)
 
-  def WriteImmediateValidationCode(self, func, file):
+  def WriteGetDataSizeCode(self, func, file):
     """Overrriden from TypeHandler."""
-    file.Write("  if (!CheckImmediateDataSize<%s>("
-               "immediate_data_size, count, sizeof(%s), %d)) {\n" %
-               (func.name, func.info.data_type, func.info.count))
-    file.Write("    return parse_error::kParseOutOfBounds;\n")
-    file.Write("  }\n")
+    file.Write("  uint32 data_size = ComputeImmediateDataSize("
+               "immediate_data_size, 1, sizeof(%s), %d);\n" %
+               (func.info.data_type, func.info.count))
 
   def WriteGLES2ImplementationHeader(self, func, file):
     """Overrriden from TypeHandler."""
     file.Write("%s %s(%s) {\n" %
                (func.return_type, func.original_name,
                 func.MakeTypedOriginalArgString("")))
     file.Write("  helper_->%sImmediate(%s);\n" %
                (func.name, func.MakeOriginalArgString("")))
     file.Write("}\n")
     file.Write("\n")
@@ skipping 150 matching lines @@
     file.Write(
         "    uint32 immediate_data_size, const gles2::%s& c) {\n" % func.name)
     last_arg = func.GetLastOriginalArg()
 
     all_but_last_arg = func.GetOriginalArgs()[:-1]
     for arg in all_but_last_arg:
       arg.WriteGetCode(file)
 
     file.Write("  uint32 name_size = c.data_size;\n")
     file.Write(
-        "  const char* name = GetImmediateDataAs<const char*>(c);\n")
-    file.Write("  // TODO(gman): Make sure validate checks\n")
-    file.Write("  //     immediate_data_size covers data_size.\n")
+        "  const char* name = GetImmediateDataAs<const char*>(\n")
+    file.Write("      c, name_size, immediate_data_size);\n")
     func.WriteHandlerValidation(file)
     arg_string = ", ".join(["%s" % arg.name for arg in all_but_last_arg])
     file.Write("  String name_str(name, name_size);\n")
     file.Write("  %s(%s, name_str.c_str());\n" %
               (func.GetGLFunctionName(), arg_string))
     file.Write("  return parse_error::kParseNoError;\n")
     file.Write("}\n")
     file.Write("\n")
 
   def WriteGLES2ImplementationHeader(self, func, file):
@@ skipping 146 matching lines @@
     file.Write(
         "    uint32 immediate_data_size, const gles2::%s& c) {\n" % func.name)
     last_arg = func.GetLastOriginalArg()
 
     all_but_last_arg = func.GetOriginalArgs()[:-1]
     for arg in all_but_last_arg:
       arg.WriteGetCode(file)
 
     file.Write("  uint32 name_size = c.data_size;\n")
     file.Write(
-        "  const char* name = GetImmediateDataAs<const char*>(c);\n")
-    file.Write("  // TODO(gman): Make sure validate checks\n")
-    file.Write("  //     immediate_data_size covers data_size.\n")
+        "  const char* name = GetImmediateDataAs<const char*>(\n")
+    file.Write("      c, name_size, immediate_data_size);\n")
     file.Write("  GLint* location = GetSharedMemoryAs<GLint*>(\n")
     file.Write(
         "      c.location_shm_id, c.location_shm_offset, sizeof(*location));\n")
     file.Write("  // TODO(gman): Validate location.\n")
     func.WriteHandlerValidation(file)
     arg_string = ", ".join(["%s" % arg.name for arg in all_but_last_arg])
     file.Write("  String name_str(name, name_size);\n")
     file.Write("  *location = %s(%s, name_str.c_str());\n" %
               (func.GetGLFunctionName(), arg_string))
     file.Write("  return parse_error::kParseNoError;\n")
@@ skipping 164 matching lines @@
   """Handler for GetProgramInfoLog, GetShaderInfoLog and GetShaderSource."""
 
   def __init__(self):
     TypeHandler.__init__(self)
 
   def WriteGLES2ImplementationHeader(self, func, file):
     """Overrriden from TypeHandler."""
     file.Write("// TODO(gman): Implement this\n")
     TypeHandler.WriteGLES2ImplementationHeader(self, func, file)
 
+  def WriteServiceImplementation(self, func, file):
+    """Overrriden from TypeHandler."""
+    file.Write(
+        "parse_error::ParseError GLES2DecoderImpl::Handle%s(\n" % func.name)
+    file.Write(
+        "    uint32 immediate_data_size, const gles2::%s& c) {\n" % func.name)
+    args = func.GetOriginalArgs()
+    all_but_last_2_args = args[:-2]
+    for arg in all_but_last_2_args:
+      arg.WriteGetCode(file)
+    self.WriteGetDataSizeCode(func, file)
+    size_arg = args[-2]
+    file.Write("  uint32 size_shm_id = c.%s_shm_id;\n" % size_arg.name)
+    file.Write("  uint32 size_shm_offset = c.%s_shm_offset;\n" % size_arg.name)
+    file.Write("  GLsizei* length = NULL;\n")
+    file.Write("  if (size_shm_id != 0 || size_shm_offset != 0) {\n"
+               "    length = GetSharedMemoryAs<GLsizei*>(\n"
+               "        size_shm_id, size_shm_offset, sizeof(*length));\n"
+               "    if (!length) {\n"
+               "      return parse_error::kParseOutOfBounds;\n"
+               "    }\n"
+               "  }\n")
+    dest_arg = args[-1]
+    bufsize_arg = args[-3]
+    file.Write(
+        "  %s %s = GetSharedMemoryAs<%s>(\n" %
+        (dest_arg.type, dest_arg.name, dest_arg.type))
+    file.Write(
+        "      c.%s_shm_id, c.%s_shm_offset, %s);\n" %
+        (dest_arg.name, dest_arg.name, bufsize_arg.name))
+    for arg in all_but_last_2_args + [dest_arg]:
+      arg.WriteValidationCode(file)
+    func.WriteValidationCode(file)
+    func.WriteHandlerImplementation(file)
+    file.Write("  return parse_error::kParseNoError;\n")
+    file.Write("}\n")
+    file.Write("\n")
+
 
 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 91 matching lines @@
   def __init__(self, name, type):
     Argument.__init__(self, name, type)
 
   def AddCmdArgs(self, args):
     """Overridden from Argument."""
     pass
 
   def WriteGetCode(self, file):
     """Overridden from Argument."""
     file.Write(
-      "  %s %s = GetImmediateDataAs<%s>(c);\n" %
-       (self.type, self.name, self.type))
+      "  %s %s = GetImmediateDataAs<%s>(\n" %
+      (self.type, self.name, self.type))
+    file.Write("      c, data_size, immediate_data_size);\n")
 
   def WriteValidationCode(self, file):
     """Overridden from Argument."""
     file.Write("  if (%s == NULL) {\n" % self.name)
     file.Write("    return parse_error::kParseOutOfBounds;\n")
     file.Write("  }\n")
 
   def GetImmediateVersion(self):
     """Overridden from Argument."""
     return None
@@ skipping 13 matching lines @@
     """Overridden from Argument."""
     args.append(Argument("%s_shm_id" % self.name, 'uint32'))
     args.append(Argument("%s_shm_offset" % self.name, 'uint32'))
 
   def WriteGetCode(self, file):
     """Overridden from Argument."""
     file.Write(
         "  %s %s = GetSharedMemoryAs<%s>(\n" %
         (self.type, self.name, self.type))
     file.Write(
-        "      c.%s_shm_id, c.%s_shm_offset, 0 /* TODO(gman): size */);\n" %
+        "      c.%s_shm_id, c.%s_shm_offset, data_size);\n" %
         (self.name, self.name))
 
   def WriteGetAddress(self, file):
     """Overridden from Argument."""
     file.Write(
         "  %s %s = GetSharedMemoryAs<%s>(\n" %
         (self.type, self.name, self.type))
     file.Write(
         "      %s_shm_id, %s_shm_offset, %s_size);\n" %
         (self.name, self.name, self.name))
@@ skipping 688 matching lines @@
 
   if options.generate_command_id_tests:
     gen.WriteCommandIdTest("common/gles2_cmd_id_test_autogen.h")
 
   if gen.errors > 0:
     print "%d errors" % gen.errors
     sys.exit(1)
 
 if __name__ == '__main__':
   main(sys.argv[1:])