Mandoline: Enable more GL commands which are used by WebGL.

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 4854 matching lines @@
     """Writes the Mojo GLES2 implementation header."""
     f.write("%s %s(%s) override;\n" %
                (func.return_type, func.original_name,
                 func.MakeTypedOriginalArgString("")))
 
   def WriteMojoGLES2Impl(self, func, f):
     """Writes the Mojo GLES2 implementation."""
     f.write("%s MojoGLES2Impl::%s(%s) {\n" %
                (func.return_type, func.original_name,
                 func.MakeTypedOriginalArgString("")))
-    extensions = ["CHROMIUM_sync_point", "CHROMIUM_texture_mailbox",
+    extensions = [True, "CHROMIUM_sync_point", "CHROMIUM_texture_mailbox",
                   "CHROMIUM_sub_image", "CHROMIUM_miscellaneous",
                   "occlusion_query_EXT", "CHROMIUM_image",
                   "CHROMIUM_copy_texture",
                   "CHROMIUM_pixel_transfer_buffer_object",
                   "chromium_framebuffer_multisample"]
-    if func.IsCoreGLFunction() or func.GetInfo("extension") in extensions:
+
+    is_core_gl_func = func.IsCoreGLFunction()
+    ext = func.GetInfo("extension")
+    is_safe = not func.IsUnsafe()
+    if is_core_gl_func or (is_safe and ext in extensions):
       f.write("MojoGLES2MakeCurrent(context_);");
       func_return = "gl" + func.original_name + "(" + \
           func.MakeOriginalArgString("") + ");"
       if func.return_type == "void":
         f.write(func_return);
       else:
         f.write("return " + func_return);
     else:
       f.write("NOTREACHED() << \"Unimplemented %s.\";\n" %
                  func.original_name);
@@ skipping 5560 matching lines @@
       f.write(code);
     self.generated_cpp_filenames.append(filename)
 
   def WriteMojoGLES2Impl(self, filename):
     """Writes the Mojo GLES2 implementation."""
     code = """
 #include "mojo/gpu/mojo_gles2_impl_autogen.h"
 
 #include "base/logging.h"
 #include "third_party/mojo/src/mojo/public/c/gles2/chromium_copy_texture.h"
+#include "third_party/mojo/src/mojo/public/c/gles2/chromium_extension.h"
 #include "third_party/mojo/src/mojo/public/c/gles2/chromium_framebuffer_multisample.h"
 #include "third_party/mojo/src/mojo/public/c/gles2/chromium_image.h"
 #include "third_party/mojo/src/mojo/public/c/gles2/chromium_miscellaneous.h"
 #include "third_party/mojo/src/mojo/public/c/gles2/chromium_pixel_transfer_buffer_object.h"
 #include "third_party/mojo/src/mojo/public/c/gles2/chromium_sub_image.h"
 #include "third_party/mojo/src/mojo/public/c/gles2/chromium_sync_point.h"
 #include "third_party/mojo/src/mojo/public/c/gles2/chromium_texture_mailbox.h"
 #include "third_party/mojo/src/mojo/public/c/gles2/gles2.h"
 #include "third_party/mojo/src/mojo/public/c/gles2/occlusion_query_ext.h"
 
@@ skipping 413 matching lines @@
                                 func.MakeTypedOriginalArgString(""),
                                 func.MakeOriginalArgString("")))
     self.generated_cpp_filenames.append(filename)
 
   def WriteMojoGLCallVisitorForExtension(self, filename, extension):
     """Provides the GL implementation for mojo for a particular extension"""
     with CWriter(filename) as f:
       for func in self.original_functions:
         if func.GetInfo("extension") != extension:
           continue
+        if func.IsUnsafe():
+          continue
         f.write("VISIT_GL_CALL(%s, %s, (%s), (%s))\n" %
                                (func.name, func.return_type,
                                 func.MakeTypedOriginalArgString(""),
                                 func.MakeOriginalArgString("")))
     self.generated_cpp_filenames.append(filename)
 
 def Format(generated_files):
   formatter = "clang-format"
   if platform.system() == "Windows":
     formatter += ".bat"
@@ skipping 99 matching lines @@
     "gles2_cmd_validation_implementation_autogen.h")
   gen.WriteCommonUtilsHeader(
     "gpu/command_buffer/common/gles2_cmd_utils_autogen.h")
   gen.WriteCommonUtilsImpl(
     "gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h")
   gen.WriteGLES2Header("gpu/GLES2/gl2chromium_autogen.h")
   mojo_gles2_prefix = ("third_party/mojo/src/mojo/public/c/gles2/"
                        "gles2_call_visitor")
   gen.WriteMojoGLCallVisitor(mojo_gles2_prefix + "_autogen.h")
   gen.WriteMojoGLCallVisitorForExtension(
+      mojo_gles2_prefix + "_chromium_extension_autogen.h",
+      True)

[Peng, 2015/09/17 16:32:33]

I am wondering why not put all gl extension APIs in one file. 

[piman, 2015/09/17 23:51:38]

I would prefer if you tagged each function that you need with the extension it
comes from  (see gpu/GLES2/extensions/CHROMIUM). "'extension': True" is
deprecated....

As to whether or not to put all extensions into a single file, I don't have an
opinion.

[Peng, 2015/09/18 15:17:16]

I tagged most functions, except several functions which I can not find in
extensions/CHROMIUM.
I think putting all extensions into a single file could make it easier to
maintain. I merged them into one file.

Done

+  gen.WriteMojoGLCallVisitorForExtension(
       mojo_gles2_prefix + "_chromium_texture_mailbox_autogen.h",
       "CHROMIUM_texture_mailbox")
   gen.WriteMojoGLCallVisitorForExtension(
       mojo_gles2_prefix + "_chromium_sync_point_autogen.h",
       "CHROMIUM_sync_point")
   gen.WriteMojoGLCallVisitorForExtension(
       mojo_gles2_prefix + "_chromium_sub_image_autogen.h",
       "CHROMIUM_sub_image")
   gen.WriteMojoGLCallVisitorForExtension(
       mojo_gles2_prefix + "_chromium_miscellaneous_autogen.h",
@@ skipping 17 matching lines @@
   Format(gen.generated_cpp_filenames)
 
   if gen.errors > 0:
     print "%d errors" % gen.errors
     return 1
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))