Adds MapBufferSubData and MapTexSubImage2D....

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 GLES2 command buffers."""
 
 import os
 import os.path
@@ skipping 164 matching lines @@
 GL_APICALL void         GL_APIENTRY glVertexAttrib4fv (GLuint indx, const GLfloat* values);
 GL_APICALL void         GL_APIENTRY glVertexAttribPointer (GLuint indx, GLintVertexAttribSize size, GLenumVertexAttribType type, GLboolean normalized, GLsizei stride, const void* ptr);
 GL_APICALL void         GL_APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
 // Non-GL commands.
 GL_APICALL void         GL_APIENTRY glSwapBuffers (void);
 GL_APICALL GLuint       GL_APIENTRY glGetMaxValueInBuffer (GLidBuffer buffer_id, GLsizei count, GLenumGetMaxIndexType type, GLuint offset);
 GL_APICALL void         GL_APIENTRY glGenSharedIds (GLuint namespace_id, GLuint id_offset, GLsizei n, GLuint* ids);
 GL_APICALL void         GL_APIENTRY glDeleteSharedIds (GLuint namespace_id, GLsizei n, const GLuint* ids);
 GL_APICALL void         GL_APIENTRY glRegisterSharedIds (GLuint namespace_id, GLsizei n, const GLuint* ids);
 GL_APICALL GLboolean    GL_APIENTRY glCommandBufferEnable (const char* feature);
+GL_APICALL void*        GL_APIENTRY glMapBufferSubData (GLuint target, GLintptr offset, GLsizeiptr size, GLenum access);
+GL_APICALL void         GL_APIENTRY glUnmapBufferSubData (const void* mem);
+GL_APICALL void*        GL_APIENTRY glMapTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLenum access);
+GL_APICALL void         GL_APIENTRY glUnmapTexSubImage2D (const void* mem);
 """
 
 # 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 769 matching lines @@
 # cmd_comment:  A comment added to the cmd format.
 # 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.
 # 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.
 # data_type:    The type of data the command uses. For PUTn or PUT types.
@@ skipping 319 matching lines @@
     'type': 'Is',
     'decoder_func': 'DoIsShader',
     'expectation': False,
   },
   'IsTexture': {
     'type': 'Is',
     'decoder_func': 'DoIsTexture',
     'expectation': False,
   },
   'LinkProgram': {'decoder_func': 'DoLinkProgram'},
+  'MapBufferSubData': {'gen_cmd': False},
+  'MapTexSubImage2D': {'gen_cmd': False},
   'PixelStorei': {'type': 'Manual'},
   'RenderbufferStorage': {
     'decoder_func': 'DoRenderbufferStorage',
     'gl_test_func': 'glRenderbufferStorageEXT',
     'expectation': False,
   },
   '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'
@@ skipping 85 matching lines @@
   'Uniform4fv': {
     'type': 'PUTn',
     'data_type': 'GLfloat',
     'count': 4,
     'decoder_func': 'DoUniform4fv',
   },
   '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},
+  'UnmapBufferSubData': {'gen_cmd': False},
+  'UnmapTexSubImage2D': {'gen_cmd': False},
   'UseProgram': {'decoder_func': 'DoUseProgram', 'unit_test': False},
   'ValidateProgram': {'decoder_func': 'DoValidateProgram'},
   'VertexAttrib1f': {'decoder_func': 'DoVertexAttrib1f'},
   'VertexAttrib1fv': {
     'type': 'PUT',
     'data_type': 'GLfloat',
     'count': 1,
     'decoder_func': 'DoVertexAttrib1fv',
   },
   'VertexAttrib2f': {'decoder_func': 'DoVertexAttrib2f'},
@@ skipping 3340 matching lines @@
             arg.AddCmdArgs(cmd_args)
           init_args = []
           for arg in args_for_cmds:
             arg.AddInitArgs(init_args)
           return_arg = CreateArg(return_type + " result")
           if return_arg:
             init_args.append(return_arg)
           f = Function(func_name, func_name, func_info, return_type, args,
                        args_for_cmds, cmd_args, init_args, num_pointer_args)
           self.original_functions.append(f)
-          self.AddFunction(f)
-          f.type_handler.AddImmediateFunction(self, f)
-          f.type_handler.AddBucketFunction(self, f)
+          gen_cmd = f.GetInfo('gen_cmd')
+          if gen_cmd == True or gen_cmd == None:
+            self.AddFunction(f)
+            f.type_handler.AddImmediateFunction(self, 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))
 
     for f in funcs:
       self.Log("  %-10s %-20s gl%s" % (f.info.type, f.return_type, f.name))
 
   def WriteCommandIds(self, filename):
     """Writes the command buffer format"""
     file = CHeaderWriter(filename)
     file.Write("#define GLES2_COMMAND_LIST(OP) \\\n")
     by_id = {}
     for func in self.functions:
-      if not func.name in _CMD_ID_TABLE:
-        self.Error("Command %s not in _CMD_ID_TABLE" % func.name)
-      by_id[_CMD_ID_TABLE[func.name]] = func
+      if True:
+      #gen_cmd = func.GetInfo('gen_cmd')
+      #if gen_cmd == True or gen_cmd == None:
+        if not func.name in _CMD_ID_TABLE:
+          self.Error("Command %s not in _CMD_ID_TABLE" % func.name)
+        by_id[_CMD_ID_TABLE[func.name]] = func
     for id in sorted(by_id.keys()):
       file.Write("  %-60s /* %d */ \\\n" %
                  ("OP(%s)" % by_id[id].name, id))
     file.Write("\n")
 
     file.Write("enum CommandId {\n")
     file.Write("  kStartPoint = cmd::kLastCommonId,  "
                "// All GLES2 commands start after this.\n")
     file.Write("#define GLES2_CMD_OP(name) k ## name,\n")
     file.Write("  GLES2_COMMAND_LIST(GLES2_CMD_OP)\n")
     file.Write("#undef GLES2_CMD_OP\n")
     file.Write("  kNumCommands\n")
     file.Write("};\n")
     file.Write("\n")
     file.Close()
 
   def WriteFormat(self, filename):
     """Writes the command buffer format"""
     file = CHeaderWriter(filename)
     for func in self.functions:
-      func.WriteStruct(file)
+      if True:
+      #gen_cmd = func.GetInfo('gen_cmd')
+      #if gen_cmd == True or gen_cmd == None:
+        func.WriteStruct(file)
     file.Write("\n")
     file.Close()
 
   def WriteDocs(self, filename):
     """Writes the command buffer doc version of the commands"""
     file = CWriter(filename)
     for func in self.functions:
-      func.WriteDocs(file)
+      if True:
+      #gen_cmd = func.GetInfo('gen_cmd')
+      #if gen_cmd == True or gen_cmd == None:
+        func.WriteDocs(file)
     file.Write("\n")
     file.Close()
 
   def WriteFormatTest(self, filename):
     """Writes the command buffer format test."""
     file = CHeaderWriter(
       filename,
       "// This file contains unit tests for gles2 commmands\n"
       "// It is included by gles2_cmd_format_test.cc\n"
       "\n")
 
     for func in self.functions:
-      func.WriteFormatTest(file)
+      if True:
+      #gen_cmd = func.GetInfo('gen_cmd')
+      #if gen_cmd == True or gen_cmd == None:
+        func.WriteFormatTest(file)
 
     file.Close()
 
   def WriteCommandIdTest(self, filename):
     """Writes the command id test."""
     file = CHeaderWriter(
         filename,
         "// This file contains unit tests for gles2 commmand ids\n")
 
     file.Write("// *** These IDs MUST NOT CHANGE!!! ***\n")
     file.Write("// Changing them will break all client programs.\n")
     file.Write("TEST(GLES2CommandIdTest, CommandIdsMatch) {\n")
     for func in self.functions:
-      if not func.name in _CMD_ID_TABLE:
-        self.Error("Command %s not in _CMD_ID_TABLE" % func.name)
-      file.Write("  COMPILE_ASSERT(%s::kCmdId == %d,\n" %
-                 (func.name, _CMD_ID_TABLE[func.name]))
-      file.Write("                 GLES2_%s_kCmdId_mismatch);\n" % func.name)
+      if True:
+      #gen_cmd = func.GetInfo('gen_cmd')
+      #if gen_cmd == True or gen_cmd == None:
+        if not func.name in _CMD_ID_TABLE:
+          self.Error("Command %s not in _CMD_ID_TABLE" % func.name)
+        file.Write("  COMPILE_ASSERT(%s::kCmdId == %d,\n" %
+                   (func.name, _CMD_ID_TABLE[func.name]))
+        file.Write("                 GLES2_%s_kCmdId_mismatch);\n" % func.name)
 
     file.Write("}\n")
     file.Write("\n")
     file.Close()
 
   def WriteCmdHelperHeader(self, filename):
     """Writes the gles2 command helper."""
     file = CHeaderWriter(filename)
 
     for func in self.functions:
-      func.WriteCmdHelper(file)
+      if True:
+      #gen_cmd = func.GetInfo('gen_cmd')
+      #if gen_cmd == True or gen_cmd == None:
+        func.WriteCmdHelper(file)
 
     file.Close()
 
   def WriteServiceImplementation(self, filename):
     """Writes the service decorder implementation."""
     file = CHeaderWriter(
         filename,
         "// It is included by gles2_cmd_decoder.cc\n")
 
     for func in self.functions:
-      func.WriteServiceImplementation(file)
+      if True:
+      #gen_cmd = func.GetInfo('gen_cmd')
+      #if gen_cmd == True or gen_cmd == None:
+        func.WriteServiceImplementation(file)
 
     file.Close()
 
   def WriteServiceUnitTests(self, filename):
     """Writes the service decorder unit tests."""
     num_tests = len(self.functions)
     step = (num_tests + 1) / 2
     count = 0
     for test_num in range(0, num_tests, step):
       count += 1
       name = filename % count
       file = CHeaderWriter(
           name,
           "// It is included by gles2_cmd_decoder_unittest_%d.cc\n" % count)
       file.SetFileNum(count)
       end = test_num + step
       if end > num_tests:
         end = num_tests
       for idx in range(test_num, end):
         func = self.functions[idx]
-        if func.GetInfo('unit_test') == False:
-          file.Write("// TODO(gman): %s\n" % func.name)
-        else:
-          func.WriteServiceUnitTest(file)
+        if True:
+        #gen_cmd = func.GetInfo('gen_cmd')
+        #if gen_cmd == True or gen_cmd == None:
+          if func.GetInfo('unit_test') == False:
+            file.Write("// TODO(gman): %s\n" % func.name)
+          else:
+            func.WriteServiceUnitTest(file)
 
       file.Close()
 
 
   def WriteGLES2CLibImplementation(self, filename):
     """Writes the GLES2 c lib implementation."""
     file = CHeaderWriter(
         filename,
         "// These functions emluate GLES2 over command buffers.\n")
 
@@ skipping 101 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:])