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 2118 matching lines @@
 
 _FUNCTION_INFO = {
   'ActiveTexture': {
     'decoder_func': 'DoActiveTexture',
     'unit_test': False,
     'impl_func': False,
     'client_test': False,
   },
   'ApplyScreenSpaceAntialiasingCHROMIUM': {
     'decoder_func': 'DoApplyScreenSpaceAntialiasingCHROMIUM',
+    'extension': 'CHROMIUM_screen_space_antialiasing',
     'extension_flag': 'chromium_screen_space_antialiasing',
     'unit_test': False,
     'client_test': False,
   },
   'AttachShader': {'decoder_func': 'DoAttachShader'},
   'BindAttribLocation': {
     'type': 'GLchar',
     'data_transfer_methods': ['bucket'],
     'needs_size': True,
   },
@@ skipping 169 matching lines @@
     'extension': "CHROMIUM_texture_mailbox",
     'chromium': True,
     'trace_level': 2,
   },
   'GenValuebuffersCHROMIUM': {
     'type': 'GENn',
     'gl_test_func': 'glGenValuebuffersCHROMIUM',
     'resource_type': 'Valuebuffer',
     'resource_types': 'Valuebuffers',
     'unit_test': False,
-    'extension': True,
+    'extension': 'CHROMIUM_subscribe_uniform',
     'chromium': True,
   },
   'DeleteValuebuffersCHROMIUM': {
     'type': 'DELn',
     'gl_test_func': 'glDeleteValuebuffersCHROMIUM',
     'resource_type': 'Valuebuffer',
     'resource_types': 'Valuebuffers',
     'unit_test': False,
-    'extension': True,
+    'extension': 'CHROMIUM_subscribe_uniform',
     'chromium': True,
   },
   'IsValuebufferCHROMIUM': {
     'type': 'Is',
     'decoder_func': 'DoIsValuebufferCHROMIUM',
     'expectation': False,
-    'extension': True,
+    'extension': 'CHROMIUM_subscribe_uniform',
     'chromium': True,
   },
   'BindValuebufferCHROMIUM': {
     'type': 'Bind',
     'decoder_func': 'DoBindValueBufferCHROMIUM',
     'gen_func': 'GenValueBuffersCHROMIUM',
     'unit_test': False,
-    'extension': True,
+    'extension': 'CHROMIUM_subscribe_uniform',
     'chromium': True,
   },
   'SubscribeValueCHROMIUM': {
     'decoder_func': 'DoSubscribeValueCHROMIUM',
     'unit_test': False,
-    'extension': True,
+    'extension': 'CHROMIUM_subscribe_uniform',
     'chromium': True,
   },
   'PopulateSubscribedValuesCHROMIUM': {
     'decoder_func': 'DoPopulateSubscribedValuesCHROMIUM',
     'unit_test': False,
-    'extension': True,
+    'extension': 'CHROMIUM_subscribe_uniform',
     'chromium': True,
   },
   'UniformValuebufferCHROMIUM': {
     'decoder_func': 'DoUniformValueBufferCHROMIUM',
     'unit_test': False,
-    'extension': True,
+    'extension': 'CHROMIUM_subscribe_uniform',
     'chromium': True,
   },
   'ClearStencil': {
     'type': 'StateSet',
     'state': 'ClearStencil',
   },
   'EnableFeatureCHROMIUM': {
     'type': 'Custom',
     'data_transfer_methods': ['shm'],
     'decoder_func': 'DoEnableFeatureCHROMIUM',
     'expectation': False,
     'cmd_args': 'GLuint bucket_id, GLint* result',
     'result': ['GLint'],
-    'extension': True,
+    'extension': 'GL_CHROMIUM_enable_feature',
     'chromium': True,
     'pepper_interface': 'ChromiumEnableFeature',
   },
   'CompileShader': {'decoder_func': 'DoCompileShader', 'unit_test': False},
   'CompressedTexImage2D': {
     'type': 'Manual',
     'data_transfer_methods': ['bucket', 'shm'],
     'trace_level': 1,
   },
   'CompressedTexSubImage2D': {
@@ skipping 53 matching lines @@
     'trace_level': 1,
   },
   'CreateGpuMemoryBufferImageCHROMIUM': {
     'type': 'Manual',
     'cmd_args':
         'GLsizei width, GLsizei height, GLenum internalformat, GLenum usage',
     'result': ['GLuint'],
     'client_test': False,
     'gen_cmd': False,
     'expectation': False,
-    'extension': "CHROMIUM_image",
+    'extension': "CHROMIUM_gpu_memory_buffer_image",
     'chromium': True,
     'trace_level': 1,
   },
   'CreateProgram': {
     'type': 'Create',
     'client_test': False,
   },
   'CreateShader': {
     'type': 'Create',
     'client_test': False,
@@ skipping 19 matching lines @@
   'BlendFunc': {
     'type': 'StateSetRGBAlpha',
     'state': 'BlendFunc',
   },
   'BlendFuncSeparate': {
     'type': 'StateSet',
     'state': 'BlendFunc',
   },
   'BlendBarrierKHR': {
     'gl_test_func': 'glBlendBarrierKHR',
-    'extension': True,
+    'extension': 'KHR_blend_equation_advanced',
     'extension_flag': 'blend_equation_advanced',
     'client_test': False,
   },
   'SampleCoverage': {'decoder_func': 'DoSampleCoverage'},
   'StencilFunc': {
     'type': 'StateSetFrontBack',
     'state': 'StencilFunc',
   },
   'StencilFuncSeparate': {
     'type': 'StateSetFrontBackSeparate',
@@ skipping 150 matching lines @@
   'FramebufferTexture2D': {
     'decoder_func': 'DoFramebufferTexture2D',
     'gl_test_func': 'glFramebufferTexture2DEXT',
     'trace_level': 1,
   },
   'FramebufferTexture2DMultisampleEXT': {
     'decoder_func': 'DoFramebufferTexture2DMultisample',
     'gl_test_func': 'glFramebufferTexture2DMultisampleEXT',
     'expectation': False,
     'unit_test': False,
+    'extension': 'EXT_multisampled_render_to_texture',
     'extension_flag': 'multisampled_render_to_texture',
     'trace_level': 1,
   },
   'FramebufferTextureLayer': {
     'decoder_func': 'DoFramebufferTextureLayer',
     'unsafe': True,
     'trace_level': 1,
   },
   'GenerateMipmap': {
     'decoder_func': 'DoGenerateMipmap',
@@ skipping 207 matching lines @@
   'GetProgramiv': {
     'type': 'GETn',
     'decoder_func': 'DoGetProgramiv',
     'result': ['SizedResult<GLint>'],
     'expectation': False,
   },
   'GetProgramInfoCHROMIUM': {
     'type': 'Custom',
     'expectation': False,
     'impl_func': False,
-    'extension': True,
+    'extension': 'CHROMIUM_get_multiple',
     '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',
     ],
   },
   'GetProgramInfoLog': {
@@ skipping 282 matching lines @@
   },
   'MapBufferCHROMIUM': {
     'gen_cmd': False,
     'extension': "CHROMIUM_pixel_transfer_buffer_object",
     'chromium': True,
     'client_test': False,
     'trace_level': 1,
   },
   'MapBufferSubDataCHROMIUM': {
     'gen_cmd': False,
-    'extension': True,
+    'extension': 'CHROMIUM_map_sub',
     'chromium': True,
     'client_test': False,
     'pepper_interface': 'ChromiumMapSub',
     'trace_level': 1,
   },
   'MapTexSubImage2DCHROMIUM': {
     'gen_cmd': False,
     'extension': "CHROMIUM_sub_image",
     'chromium': True,
     'client_test': False,
@@ skipping 64 matching lines @@
     'pepper_name': 'RenderbufferStorageMultisampleEXT',
     'trace_level': 1,
   },
   'RenderbufferStorageMultisampleEXT': {
     'cmd_comment':
         '// GL_EXT_multisampled_render_to_texture\n',
     'decoder_func': 'DoRenderbufferStorageMultisampleEXT',
     'gl_test_func': 'glRenderbufferStorageMultisampleEXT',
     'expectation': False,
     'unit_test': False,
+    'extension': 'EXT_multisampled_render_to_texture',
     'extension_flag': 'multisampled_render_to_texture',
     'trace_level': 1,
   },
   'ReadBuffer': {
     'unsafe': True,
     'decoder_func': 'DoReadBuffer',
     'trace_level': 1,
   },
   'ReadPixels': {
     'cmd_comment':
@@ skipping 332 matching lines @@
   },
   'UnmapBufferCHROMIUM': {
     'gen_cmd': False,
     'extension': "CHROMIUM_pixel_transfer_buffer_object",
     'chromium': True,
     'client_test': False,
     'trace_level': 1,
   },
   'UnmapBufferSubDataCHROMIUM': {
     'gen_cmd': False,
-    'extension': True,
+    'extension': 'CHROMIUM_map_sub',
     'chromium': True,
     'client_test': False,
     'pepper_interface': 'ChromiumMapSub',
     'trace_level': 1,
   },
   'UnmapBuffer': {
     'type': 'Custom',
     'unsafe': True,
     'trace_level': 1,
   },
@@ skipping 98 matching lines @@
     'impl_func': False,
     'cmd_args': 'uint32_t bucket_id',
     'extension': True,
     'chromium': True,
   },
   'RequestExtensionCHROMIUM': {
     'type': 'Custom',
     'impl_func': False,
     'client_test': False,
     'cmd_args': 'uint32_t bucket_id',
-    'extension': True,
+    'extension': 'CHROMIUM_request_extension',
     'chromium': True,
   },
   'RateLimitOffscreenContextCHROMIUM': {
     'gen_cmd': False,
     'extension': True,
     'chromium': True,
     'client_test': False,
   },
   'CreateStreamTextureCHROMIUM':  {
     'type': 'HandWritten',
@@ skipping 20 matching lines @@
   'CopySubTextureCHROMIUM': {
     'decoder_func': 'DoCopySubTextureCHROMIUM',
     'unit_test': False,
     'extension': "CHROMIUM_copy_texture",
     'chromium': True,
     'trace_level': 2,
   },
   'CompressedCopyTextureCHROMIUM': {
     'decoder_func': 'DoCompressedCopyTextureCHROMIUM',
     'unit_test': False,
-    'extension': True,
+    'extension': 'CHROMIUM_copy_compressed_texture',
     'chromium': True,
   },
   'CompressedCopySubTextureCHROMIUM': {
     'decoder_func': 'DoCompressedCopySubTextureCHROMIUM',
     'unit_test': False,
-    'extension': True,
+    'extension': 'CHROMIUM_copy_compressed_texture',
     'chromium': True,
   },
   'TexStorage2DEXT': {
     'unit_test': False,
-    'extension': True,
+    'extension': 'EXT_texture_storage',
     'decoder_func': 'DoTexStorage2DEXT',
     'trace_level': 2,
   },
   'DrawArraysInstancedANGLE': {
     'type': 'Manual',
     'cmd_args': 'GLenumDrawMode mode, GLint first, GLsizei count, '
                 'GLsizei primcount',
-    'extension': True,
+    'extension': 'ANGLE_instanced_arrays',
     'unit_test': False,
     'pepper_interface': 'InstancedArrays',
     'defer_draws': True,
     'trace_level': 2,
   },
   'DrawBuffersEXT': {
     'type': 'PUTn',
     'decoder_func': 'DoDrawBuffersEXT',
     'count': 1,
     'client_test': False,
     'unit_test': False,
     # could use 'extension_flag': 'ext_draw_buffers' but currently expected to
     # work without.
-    'extension': True,
+    'extension': 'EXT_draw_buffers',
     'pepper_interface': 'DrawBuffers',
     'trace_level': 2,
   },
   'DrawElementsInstancedANGLE': {
     'type': 'Manual',
     'cmd_args': 'GLenumDrawMode mode, GLsizei count, '
                 'GLenumIndexType type, GLuint index_offset, GLsizei primcount',
-    'extension': True,
+    'extension': 'ANGLE_instanced_arrays',
     'unit_test': False,
     'client_test': False,
     'pepper_interface': 'InstancedArrays',
     'defer_draws': True,
     'trace_level': 2,
   },
   'VertexAttribDivisorANGLE': {
     'type': 'Manual',
     'cmd_args': 'GLuint index, GLuint divisor',
-    'extension': True,
+    'extension': 'ANGLE_instanced_arrays',
     'unit_test': False,
     'pepper_interface': 'InstancedArrays',
   },
   'GenQueriesEXT': {
     'type': 'GENn',
     'gl_test_func': 'glGenQueriesARB',
     'resource_type': 'Query',
     'resource_types': 'Queries',
     'unit_test': False,
     'pepper_interface': 'Query',
@@ skipping 87 matching lines @@
   'SetDisjointValueSyncCHROMIUM': {
     'type': 'Manual',
     'data_transfer_methods': ['shm'],
     'client_test': False,
     'cmd_args': 'void* sync_data',
     'extension': True,
     'chromium': True,
   },
   'BindUniformLocationCHROMIUM': {
     'type': 'GLchar',
-    'extension': True,
+    'extension': 'CHROMIUM_bind_uniform_location',
     'data_transfer_methods': ['bucket'],
     'needs_size': True,
     'gl_test_func': 'DoBindUniformLocationCHROMIUM',
   },
   'InsertEventMarkerEXT': {
     'type': 'GLcharN',
     'decoder_func': 'DoInsertEventMarkerEXT',
     'expectation': False,
-    'extension': True,
+    'extension': 'EXT_debug_marker',
   },
   'PushGroupMarkerEXT': {
     'type': 'GLcharN',
     'decoder_func': 'DoPushGroupMarkerEXT',
     'expectation': False,
-    'extension': True,
+    'extension': 'EXT_debug_marker',
   },
   'PopGroupMarkerEXT': {
     'decoder_func': 'DoPopGroupMarkerEXT',
     'expectation': False,
-    'extension': True,
+    'extension': 'EXT_debug_marker',
     'impl_func': False,
   },
 
   'GenVertexArraysOES': {
     'type': 'GENn',
-    'extension': True,
+    'extension': 'OES_vertex_array_object',
     'gl_test_func': 'glGenVertexArraysOES',
     'resource_type': 'VertexArray',
     'resource_types': 'VertexArrays',
     'unit_test': False,
     'pepper_interface': 'VertexArrayObject',
   },
   'BindVertexArrayOES': {
     'type': 'Bind',
-    'extension': True,
+    'extension': 'OES_vertex_array_object',
     'gl_test_func': 'glBindVertexArrayOES',
     'decoder_func': 'DoBindVertexArrayOES',
     'gen_func': 'GenVertexArraysOES',
     'unit_test': False,
     'client_test': False,
     'pepper_interface': 'VertexArrayObject',
   },
   'DeleteVertexArraysOES': {
     'type': 'DELn',
-    'extension': True,
+    'extension': 'OES_vertex_array_object',
     'gl_test_func': 'glDeleteVertexArraysOES',
     'resource_type': 'VertexArray',
     'resource_types': 'VertexArrays',
     'unit_test': False,
     'pepper_interface': 'VertexArrayObject',
   },
   'IsVertexArrayOES': {
     'type': 'Is',
-    'extension': True,
+    'extension': 'OES_vertex_array_object',
     'gl_test_func': 'glIsVertexArrayOES',
     'decoder_func': 'DoIsVertexArrayOES',
     'expectation': False,
     'unit_test': False,
     'pepper_interface': 'VertexArrayObject',
   },
   'BindTexImage2DCHROMIUM': {
     'decoder_func': 'DoBindTexImage2DCHROMIUM',
     'unit_test': False,
     'extension': "CHROMIUM_image",
@@ skipping 24 matching lines @@
     'gen_cmd': False,
     'extension': "CHROMIUM_miscellaneous",
     'chromium': True,
     'client_test': False,
   },
   'TraceBeginCHROMIUM': {
     'type': 'Custom',
     'impl_func': False,
     'client_test': False,
     'cmd_args': 'GLuint category_bucket_id, GLuint name_bucket_id',
-    'extension': True,
+    'extension': 'CHROMIUM_trace_marker',
     'chromium': True,
   },
   'TraceEndCHROMIUM': {
     'impl_func': False,
     'client_test': False,
     'decoder_func': 'DoTraceEndCHROMIUM',
     'unit_test': False,
-    'extension': True,
+    'extension': 'CHROMIUM_trace_marker',
     'chromium': True,
   },
   'DiscardFramebufferEXT': {
     'type': 'PUTn',
     'count': 1,
     'decoder_func': 'DoDiscardFramebufferEXT',
     'unit_test': False,
     'client_test': False,
+    'extension': 'EXT_discard_framebuffer',
     'extension_flag': 'ext_discard_framebuffer',
     'trace_level': 2,
   },
   'LoseContextCHROMIUM': {
     'decoder_func': 'DoLoseContextCHROMIUM',
     'unit_test': False,
-    'extension': True,
+    'extension': 'CHROMIUM_lose_context',
     'chromium': True,
     'trace_level': 1,
   },
   'InsertSyncPointCHROMIUM': {
     'type': 'HandWritten',
     'impl_func': False,
     'extension': "CHROMIUM_sync_point",
     'chromium': True,
     'trace_level': 1,
   },
   'WaitSyncPointCHROMIUM': {
     'type': 'Custom',
     'impl_func': True,
     'extension': "CHROMIUM_sync_point",
     'chromium': True,
     'trace_level': 1,
   },
   'DiscardBackbufferCHROMIUM': {
     'type': 'Custom',
     'impl_func': True,
     'extension': True,
     'chromium': True,
     'trace_level': 2,
   },
   'ScheduleOverlayPlaneCHROMIUM': {
       'type': 'Custom',
       'impl_func': True,
       'unit_test': False,
       'client_test': False,
-      'extension': True,
+      'extension': 'CHROMIUM_schedule_overlay_plane',
       'chromium': True,
   },
   'MatrixLoadfCHROMIUM': {
     'type': 'PUT',
     'count': 16,
     'data_type': 'GLfloat',
     'decoder_func': 'DoMatrixLoadfCHROMIUM',
     'gl_test_func': 'glMatrixLoadfEXT',
     'chromium': True,
-    'extension': True,
+    'extension': 'CHROMIUM_path_rendering',
     'extension_flag': 'chromium_path_rendering',
   },
   'MatrixLoadIdentityCHROMIUM': {
     'decoder_func': 'DoMatrixLoadIdentityCHROMIUM',
     'gl_test_func': 'glMatrixLoadIdentityEXT',
     'chromium': True,
-    'extension': True,
+    'extension': 'CHROMIUM_path_rendering',
     'extension_flag': 'chromium_path_rendering',
   },
   'GenPathsCHROMIUM': {
     'type': 'Custom',
     'cmd_args': 'GLuint first_client_id, GLsizei range',
     'chromium': True,
-    'extension': True,
+    'extension': 'CHROMIUM_path_rendering',
     'extension_flag': 'chromium_path_rendering',
   },
   'DeletePathsCHROMIUM': {
     'type': 'Custom',
     'cmd_args': 'GLuint first_client_id, GLsizei range',
     'impl_func': False,
     'unit_test': False,
     'chromium': True,
-    'extension': True,
+    'extension': 'CHROMIUM_path_rendering',
     'extension_flag': 'chromium_path_rendering',
   },
   'IsPathCHROMIUM': {
     'type': 'Is',
     'decoder_func': 'DoIsPathCHROMIUM',
     'gl_test_func': 'glIsPathNV',
     'chromium': True,
-    'extension': True,
+    'extension': 'CHROMIUM_path_rendering',
     'extension_flag': 'chromium_path_rendering',
   },
   'PathCommandsCHROMIUM': {
     'type': 'Manual',
     'immediate': False,
     'chromium': True,
-    'extension': True,
+    'extension': 'CHROMIUM_path_rendering',
     'extension_flag': 'chromium_path_rendering',
   },
   'PathParameterfCHROMIUM': {
     'type': 'Custom',
     'chromium': True,
-    'extension': True,
+    'extension': 'CHROMIUM_path_rendering',
     'extension_flag': 'chromium_path_rendering',
   },
   'PathParameteriCHROMIUM': {
     'type': 'Custom',
     'chromium': True,
-    'extension': True,
+    'extension': 'CHROMIUM_path_rendering',
     'extension_flag': 'chromium_path_rendering',
   },
   'PathStencilFuncCHROMIUM': {
     'type': 'StateSet',
     'state': 'PathStencilFuncCHROMIUM',
     'decoder_func': 'glPathStencilFuncNV',
     'chromium': True,
-    'extension': True,
+    'extension': 'CHROMIUM_path_rendering',
     'extension_flag': 'chromium_path_rendering',
   },
   'StencilFillPathCHROMIUM': {
     'type': 'Custom',
     'chromium': True,
-    'extension': True,
+    'extension': 'CHROMIUM_path_rendering',
     'extension_flag': 'chromium_path_rendering',
   },
   'StencilStrokePathCHROMIUM': {
     'type': 'Custom',
     'chromium': True,
-    'extension': True,
+    'extension': 'CHROMIUM_path_rendering',
     'extension_flag': 'chromium_path_rendering',
   },
   'CoverFillPathCHROMIUM': {
     'type': 'Custom',
     'chromium': True,
-    'extension': True,
+    'extension': 'CHROMIUM_path_rendering',
     'extension_flag': 'chromium_path_rendering',
   },
   'CoverStrokePathCHROMIUM': {
     'type': 'Custom',
     'chromium': True,
-    'extension': True,
+    'extension': 'CHROMIUM_path_rendering',
     'extension_flag': 'chromium_path_rendering',
   },
   'StencilThenCoverFillPathCHROMIUM': {
     'type': 'Custom',
     'chromium': True,
-    'extension': True,
+    'extension': 'CHROMIUM_path_rendering',
     'extension_flag': 'chromium_path_rendering',
   },
   'StencilThenCoverStrokePathCHROMIUM': {
     'type': 'Custom',
     'chromium': True,
-    'extension': True,
+    'extension': 'CHROMIUM_path_rendering',
     'extension_flag': 'chromium_path_rendering',
   },
 
 }
 
 
 def Grouper(n, iterable, fillvalue=None):
   """Collect data into fixed-length chunks or blocks"""
   args = [iter(iterable)] * n
   return itertools.izip_longest(fillvalue=fillvalue, *args)
@@ skipping 643 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",
-                  "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()
+    is_ext = bool(func.GetInfo("extension"))
+    is_safe = not func.IsUnsafe()
+    if is_core_gl_func or (is_safe and is_ext):
       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 5559 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_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/chromium_extension.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"
 
 namespace mojo {
 
     """
     with CWriter(filename) as f:
       f.write(code);
       for func in self.original_functions:
         func.WriteMojoGLES2Impl(f)
       code = """
 
@@ skipping 398 matching lines @@
     with CWriter(filename) as f:
       for func in self.original_functions:
         if not func.IsCoreGLFunction():
           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 WriteMojoGLCallVisitorForExtension(self, filename, extension):
-    """Provides the GL implementation for mojo for a particular extension"""
+  def WriteMojoGLCallVisitorForExtension(self, filename):
+    """Provides the GL implementation for mojo for all extensions"""
     with CWriter(filename) as f:
       for func in self.original_functions:
-        if func.GetInfo("extension") != extension:
+        if not func.GetInfo("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":
@@ skipping 100 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_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",
-      "CHROMIUM_miscellaneous")
-  gen.WriteMojoGLCallVisitorForExtension(
-      mojo_gles2_prefix + "_occlusion_query_ext_autogen.h",
-      "occlusion_query_EXT")
-  gen.WriteMojoGLCallVisitorForExtension(
-      mojo_gles2_prefix + "_chromium_image_autogen.h",
-      "CHROMIUM_image")
-  gen.WriteMojoGLCallVisitorForExtension(
-      mojo_gles2_prefix + "_chromium_copy_texture_autogen.h",
-      "CHROMIUM_copy_texture")
-  gen.WriteMojoGLCallVisitorForExtension(
-      mojo_gles2_prefix + "_chromium_pixel_transfer_buffer_object_autogen.h",
-      "CHROMIUM_pixel_transfer_buffer_object")
-  gen.WriteMojoGLCallVisitorForExtension(
-      mojo_gles2_prefix + "_chromium_framebuffer_multisample_autogen.h",
-      "chromium_framebuffer_multisample")
+      mojo_gles2_prefix + "_chromium_extension_autogen.h")
 
   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:]))