summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authornfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-24 18:33:27 +0000
committernfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-24 18:33:27 +0000
commit60daea336a68b8cf8cbd47114a1a29486a793a62 (patch)
tree72eecf5ab6d8f9d476007eb89ccf1ee9a7d659ac /gpu
parent3a29a6eb503d6b73bbc1c9c9dd58614547190ae1 (diff)
downloadchromium_src-60daea336a68b8cf8cbd47114a1a29486a793a62.zip
chromium_src-60daea336a68b8cf8cbd47114a1a29486a793a62.tar.gz
chromium_src-60daea336a68b8cf8cbd47114a1a29486a793a62.tar.bz2
Switch nacl proxy code auto-gen to graphics3d interface.
BUG=none TEST=rolled output into NaCl Review URL: http://codereview.chromium.org/7669034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98083 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rwxr-xr-xgpu/command_buffer/build_gles2_cmd_buffer.py17
1 files changed, 10 insertions, 7 deletions
diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py
index b09e24a..7268091 100755
--- a/gpu/command_buffer/build_gles2_cmd_buffer.py
+++ b/gpu/command_buffer/build_gles2_cmd_buffer.py
@@ -5870,24 +5870,26 @@ const PPB_OpenGLES2_Dev* OpenGLES2Impl::GetInterface() {
def WritePepperGLES2NaClProxy(self, filename):
"""Writes the Pepper OpenGLES interface implementation for NaCl."""
-
file = CWriter(filename)
file.Write(_LICENSE)
file.Write(_DO_NOT_EDIT_WARNING)
file.Write("#include \"native_client/src/shared/ppapi_proxy"
- "/plugin_context_3d.h\"\n\n")
+ "/plugin_ppb_graphics_3d.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("\n#include \"native_client/src/third_party"
+ "/ppapi/c/dev/ppb_opengles_dev.h\"\n\n")
- file.Write("using ppapi_proxy::PluginContext3D;\n")
+ file.Write("using ppapi_proxy::PluginGraphics3D;\n")
file.Write("using ppapi_proxy::PluginResource;\n\n")
file.Write("namespace {\n\n")
for func in self.original_functions:
if not func.IsCoreGLFunction():
continue
+ if func.IsType("UnknownCommand"):
+ continue
args = func.MakeTypedOriginalArgString("")
if len(args) != 0:
args = ", " + args
@@ -5896,7 +5898,7 @@ const PPB_OpenGLES2_Dev* OpenGLES2Impl::GetInterface() {
return_string = "return "
if func.return_type == "void":
return_string = ""
- file.Write(" %sPluginContext3D::implFromResource(context)->"
+ file.Write(" %sPluginGraphics3D::implFromResource(context)->"
"%s(%s);\n" %
(return_string,
func.original_name,
@@ -5906,12 +5908,13 @@ const PPB_OpenGLES2_Dev* OpenGLES2Impl::GetInterface() {
file.Write("\n} // namespace\n\n")
file.Write("const PPB_OpenGLES2_Dev* "
- "PluginContext3D::GetOpenGLESInterface() {\n")
+ "PluginGraphics3D::GetOpenGLESInterface() {\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()))
+ 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")