Revert 99855 - Move PPAPI graphics3d and opengles interfaces out of Dev.

gpu/command_buffer/build_gles2_cmd_buffer.py

 #!/usr/bin/python
 #
 # Copyright (c) 2011 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 5735 matching lines @@
         "// OpenGL ES interface.\n",
         3)
 
     file.Write("#include \"ppapi/c/pp_resource.h\"\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("#define PPB_OPENGLES2_INTERFACE "
-        "\"PPB_OpenGLES;2.0\"\n")
+    file.Write("#define PPB_OPENGLES2_DEV_INTERFACE "
+        "\"PPB_OpenGLES(Dev);2.0\"\n")
 
-    file.Write("\nstruct PPB_OpenGLES2 {\n")
+    file.Write("\nstruct PPB_OpenGLES2_Dev {\n")
     for func in self.original_functions:
       if not func.IsCoreGLFunction():
         continue
 
       original_arg = func.MakeTypedOriginalArgString("")
       context_arg = "PP_Resource context"
       if len(original_arg):
         arg = context_arg + ", " + original_arg
       else:
         arg = context_arg
@@ skipping 41 matching lines @@
       else:
         arg = context_arg
       file.Write("%s %s(%s) {\n" % (func.return_type, func.name, arg))
 
       return_str = "" if func.return_type == "void" else "return "
       file.Write("  %sGetGLES(context_id)->%s(%s);\n" %
                  (return_str, func.original_name,
                   func.MakeOriginalArgString("")))
       file.Write("}\n\n")
 
-    file.Write("\nconst struct PPB_OpenGLES2 ppb_opengles2 = {\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 f.IsCoreGLFunction()))
     file.Write("\n")
     file.Write("};\n\n")
 
     file.Write("}  // namespace\n")
 
     file.Write("""
-const PPB_OpenGLES2* OpenGLES2Impl::GetInterface() {
+const PPB_OpenGLES2_Dev* OpenGLES2Impl::GetInterface() {
   return &ppb_opengles2;
 }
 
 """)
     file.Write("}  // namespace ppapi\n")
     file.Close()
 
   def WriteGLES2ToPPAPIBridge(self, filename):
     """Connects GLES2 helper library to PPB_OpenGLES2 interface"""
 
@@ skipping 55 matching lines @@
         return_string = ""
       file.Write("  %sPluginGraphics3D::implFromResource(context)->"
                  "%s(%s);\n" %
                  (return_string,
                   func.original_name,
                   func.MakeOriginalArgString("")))
       file.Write("}\n")
 
     file.Write("\n} // namespace\n\n")
 
-    file.Write("const PPB_OpenGLES2* "
+    file.Write("const PPB_OpenGLES2_Dev* "
                "PluginGraphics3D::GetOpenGLESInterface() {\n")
 
-    file.Write("  const static struct PPB_OpenGLES2 ppb_opengles = {\n")
+    file.Write("  const static struct PPB_OpenGLES2_Dev ppb_opengles = {\n")
     file.Write("    &")
     file.Write(",\n    &".join(
       f.name for f in self.original_functions if (f.IsCoreGLFunction() and
         not f.IsType("UnknownCommand"))))
     file.Write("\n")
     file.Write("  };\n")
     file.Write("  return &ppb_opengles;\n")
     file.Write("}\n")
     file.Close()
 
@@ skipping 72 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:])