Moved the logic of maintaining the current context to gles2 helper library.

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 30 matching lines @@
   'GLint': 'int',
   'GLsizei': 'int',
   'GLubyte': 'unsigned char',
   'GLushort': 'unsigned short',
   'GLuint': 'unsigned int',
   'GLfloat': 'float',
   'GLclampf': 'float',
   'GLvoid': 'void',
   'GLfixed': 'int',
   'GLclampx': 'int',
-  'GLintptr': 'khronos_intptr_t',
-  'GLsizeiptr': 'khronos_ssize_t',
+  'GLintptr': 'long int',
+  'GLsizeiptr': 'long int',
 }
 _GL_FUNCTIONS = """
 GL_APICALL void         GL_APIENTRY glActiveTexture (GLenum texture);
 GL_APICALL void         GL_APIENTRY glAttachShader (GLidProgram program, GLidShader shader);
 GL_APICALL void         GL_APIENTRY glBindAttribLocation (GLidProgram program, GLuint index, const char* name);
 GL_APICALL void         GL_APIENTRY glBindBuffer (GLenumBufferTarget target, GLidBindBuffer buffer);
 GL_APICALL void         GL_APIENTRY glBindFramebuffer (GLenumFrameBufferTarget target, GLidBindFramebuffer framebuffer);
 GL_APICALL void         GL_APIENTRY glBindRenderbuffer (GLenumRenderBufferTarget target, GLidBindRenderbuffer renderbuffer);
 GL_APICALL void         GL_APIENTRY glBindTexture (GLenumTextureBindTarget target, GLidBindTexture texture);
 GL_APICALL void         GL_APIENTRY glBlendColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
@@ skipping 1392 matching lines @@
     'needs_size': True,
     'cmd_args':
         'GLuint shader, const char* data',
   },
   'StencilMask': {'decoder_func': 'DoStencilMask'},
   'StencilMaskSeparate': {'decoder_func': 'DoStencilMaskSeparate'},
   'SwapBuffers': {
     'type': 'Custom',
     'impl_func': False,
     'unit_test': False,
+    'extension': True,
   },
   'TexImage2D': {'type': 'Manual', 'immediate': True},
   'TexParameterf': {'decoder_func': 'DoTexParameterf'},
   'TexParameteri': {'decoder_func': 'DoTexParameteri'},
   'TexParameterfv': {
     'type': 'PUT',
     'data_type': 'GLfloat',
     'count': 1,
     'decoder_func': 'DoTexParameterfv',
   },
@@ skipping 3031 matching lines @@
   def GetInfo(self, name):
     """Returns a value from the function info for this function."""
     if hasattr(self.info, name):
       return getattr(self.info, name)
     return None
 
   def AddInfo(self, name, value):
     """Adds an info."""
     setattr(self.info, name, value)
 
+  def IsCoreGLFunction(self):
+    return not self.GetInfo('extension')
+
   def GetGLFunctionName(self):
     """Gets the function to call to execute GL for this command."""
     if self.GetInfo('decoder_func'):
       return self.GetInfo('decoder_func')
     return "gl%s" % self.original_name
 
   def GetGLTestFunctionName(self):
     gl_func_name = self.GetInfo('gl_test_func')
     if gl_func_name == None:
       gl_func_name = self.GetGLFunctionName()
@@ skipping 722 matching lines @@
           'post': post,
         })
       pre = '  '
     file.Write("}\n\n");
     file.Close()
 
   def WritePepperGLES2Interface(self, filename):
     """Writes the Pepper OpenGLES interface definition."""
     file = CHeaderWriter(
         filename,
-        "// This interface is used to access common and lite profile OpenGL ES "
-        "2.0\n// functions.\n",
+        "// OpenGL ES interface.\n",
         3)
 
-    file.Write("#include \"ppapi/GLES2/khrplatform.h\"\n\n")
-
-    file.Write("#define PPB_OPENGLES_DEV_INTERFACE \"PPB_OpenGLES(Dev);2.0\"\n\n")
-
+    file.Write("#ifndef __gl2_h_\n")
     for (k, v) in _GL_TYPES.iteritems():
       file.Write("typedef %s %s;\n" % (v, k))
+    file.Write("#endif  // __gl2_h_\n\n")
 
-    file.Write("\nstruct PPB_OpenGLES_Dev {\n")
+    file.Write("#define PPB_OPENGLES2_DEV_INTERFACE \"PPB_OpenGLES(Dev);2.0\"\n")
+
+    file.Write("\nstruct PPB_OpenGLES2_Dev {\n")
     for func in self.original_functions:
-      if func.GetInfo('extension'):
+      if not func.IsCoreGLFunction():
         continue
-      file.Write("  %s (*%s)(%s);\n" %
-                 (func.return_type, func.name,
-                  func.MakeTypedOriginalArgString("")))
+
+      original_arg = func.MakeTypedOriginalArgString("")
+      context_arg = "PP_Resource context"
+      if len(original_arg):
+        arg = context_arg + ", " + original_arg
+      else:
+        arg = context_arg
+      file.Write("  %s (*%s)(%s);\n" % (func.return_type, func.name, arg))
     file.Write("};\n\n")
 
     file.Close()
 
   def WritePepperGLES2Implementation(self, filename):
     """Writes the Pepper OpenGLES interface implementation."""
 
     file = CWriter(filename)
     file.Write(_LICENSE)
     file.Write("// This file is auto-generated. DO NOT EDIT!\n\n")
 
-    file.Write("#include \"webkit/glue/plugins/pepper_graphics_3d.h\"\n\n")
+    file.Write("#include \"webkit/plugins/ppapi/ppb_graphics_3d_impl.h\"\n\n")
 
     file.Write("#include \"gpu/command_buffer/client/gles2_implementation.h\"")
     file.Write("\n#include \"ppapi/c/dev/ppb_opengles_dev.h\"\n\n")
 
-    file.Write("namespace pepper {\n\n")
+    file.Write("namespace webkit {\n")
+    file.Write("namespace ppapi {\n\n")
     file.Write("namespace {\n\n")
 
     for func in self.original_functions:
-      if func.GetInfo('extension'):
+      if not func.IsCoreGLFunction():
         continue
-      file.Write("%s %s(%s) {\n" %
-                 (func.return_type, func.name,
-                  func.MakeTypedOriginalArgString("")))
-      return_string = "return "
-      if func.return_type == "void":
-        return_string = ""
-      file.Write("  %sGraphics3D::GetCurrent()->impl()->%s(%s);\n" %
-                 (return_string, func.original_name,
+
+      original_arg = func.MakeTypedOriginalArgString("")
+      context_arg = "PP_Resource context"
+      if len(original_arg):
+        arg = context_arg + ", " + original_arg
+      else:
+        arg = context_arg
+      file.Write("%s %s(%s) {\n" % (func.return_type, func.name, arg))
+      
+      file.Write("""  scoped_refptr<PPB_Graphics3D_Impl> graphics_3d = 
+      Resource::GetAs<PPB_Graphics3D_Impl>(context);
+""")
+
+      return_str = "" if func.return_type == "void" else "return "
+      file.Write("  %sgraphics_3d->impl()->%s(%s);\n" %
+                 (return_str, func.original_name,
                   func.MakeOriginalArgString("")))
-      file.Write("}\n")
+      file.Write("}\n\n")
 
-    file.Write("\nconst struct PPB_OpenGLES_Dev ppb_opengles = {\n")
-
+    file.Write("\nconst struct PPB_OpenGLES2_Dev ppb_opengles2 = {\n")
     file.Write("  &")
     file.Write(",\n  &".join(
-      f.name for f in self.original_functions if not f.GetInfo('extension')))
+      f.name for f in self.original_functions if f.IsCoreGLFunction()))
     file.Write("\n")
+    file.Write("};\n\n")
 
-    file.Write("};\n\n")
     file.Write("}  // namespace\n")
 
     file.Write("""
-const PPB_OpenGLES_Dev* Graphics3D::GetOpenGLESInterface() {
-  return &ppb_opengles;
+const PPB_OpenGLES2_Dev* PPB_Graphics3D_Impl::GetOpenGLES2Interface() {
+  return &ppb_opengles2;
 }
 
 """)
-    file.Write("}  // namespace pepper\n\n")
+    file.Write("}  // namespace ppapi\n")
+    file.Write("}  // namespace webkit\n\n")
 
     file.Close()
 
   def WriteGLES2ToPPAPIBridge(self, filename):
     """Connects GLES2 helper library to PPB_OpenGLES2 interface"""
 
     file = CWriter(filename)
     file.Write(_LICENSE)
     file.Write("// This file is auto-generated. DO NOT EDIT!\n\n")
 
-    file.Write("#include <GLES2/gl2.h>\n\n")
+    file.Write("#include <GLES2/gl2.h>\n")
+    file.Write("#include \"ppapi/lib/gl/gles2/gl2ext_ppapi.h\"\n\n")
 
     for func in self.original_functions:
-      if func.GetInfo('extension') or func.name == 'SwapBuffers':
+      if not func.IsCoreGLFunction():
         continue
 
       file.Write("%s GL_APIENTRY gl%s(%s) {\n" %
                  (func.return_type, func.name,
                   func.MakeTypedOriginalArgString("")))
-      if func.return_type != "void":
-        file.Write("  return 0;\n")
+      return_str = "" if func.return_type == "void" else "return "
+      interface_str = "glGetInterfacePPAPI()"
+      original_arg = func.MakeOriginalArgString("")
+      context_arg = "glGetCurrentContextPPAPI()"
+      if len(original_arg):
+        arg = context_arg + ", " + original_arg
+      else:
+        arg = context_arg
+      file.Write("  %s%s->%s(%s);\n" %
+                 (return_str, interface_str, func.name, arg))
       file.Write("}\n\n")
-  
+
 def main(argv):
   """This is the main function."""
   parser = OptionParser()
   parser.add_option(
       "-g", "--generate-implementation-templates", action="store_true",
       help="generates files that are generally hand edited..")
   parser.add_option(
       "--generate-command-id-tests", action="store_true",
       help="generate tests for commands ids. Commands MUST not change ID!")
   parser.add_option(
@@ skipping 14 matching lines @@
 
   gen = GLGenerator(options.verbose)
   gen.ParseGLH("common/GLES2/gl2.h")
 
   if options.alternate_mode == "ppapi":
     gen.WritePepperGLES2Interface("ppapi/c/dev/ppb_opengles_dev.h")
     gen.WriteGLES2ToPPAPIBridge("ppapi/lib/gl/gles2/gles2.c")
 
   elif options.alternate_mode == "chrome_ppapi":
     gen.WritePepperGLES2Implementation(
-        "webkit/glue/plugins/pepper_graphics_3d_gl.cc")
+        "webkit/plugins/ppapi/ppb_opengles_impl.cc")
 
   else:
     gen.WriteCommandIds("common/gles2_cmd_ids_autogen.h")
     gen.WriteFormat("common/gles2_cmd_format_autogen.h")
     gen.WriteFormatTest("common/gles2_cmd_format_test_autogen.h")
     gen.WriteGLES2ImplementationHeader("client/gles2_implementation_autogen.h")
     gen.WriteGLES2CLibImplementation("client/gles2_c_lib_autogen.h")
     gen.WriteCmdHelperHeader("client/gles2_cmd_helper_autogen.h")
     gen.WriteServiceImplementation("service/gles2_cmd_decoder_autogen.h")
     gen.WriteServiceUnitTests("service/gles2_cmd_decoder_unittest_%d_autogen.h")
     gen.WriteServiceUtilsHeader("service/gles2_cmd_validation_autogen.h")
     gen.WriteServiceUtilsImplementation(
         "service/gles2_cmd_validation_implementation_autogen.h")
 
     if options.generate_command_id_tests:
       gen.WriteCommandIdTest("common/gles2_cmd_id_test_autogen.h")
 
     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:])