diff options
| author | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 23:36:26 +0000 |
|---|---|---|
| committer | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 23:36:26 +0000 |
| commit | 24efa80adcf956b606bdda62091357510894e5cf (patch) | |
| tree | e9b63f7e520bd38592f5de2e27e4ca67af8f8f3b /gpu/command_buffer | |
| parent | 844cf21c267a04f519386c2753780531f0dc9214 (diff) | |
| download | chromium_src-24efa80adcf956b606bdda62091357510894e5cf.zip chromium_src-24efa80adcf956b606bdda62091357510894e5cf.tar.gz chromium_src-24efa80adcf956b606bdda62091357510894e5cf.tar.bz2 | |
Revert 99855 - Move PPAPI graphics3d and opengles interfaces out of Dev.
BUG= http://code.google.com/p/chromium/issues/detail?id=94320
TEST= various nacl exmaples, try bots
Review URL: http://codereview.chromium.org/7737013
TBR=nfullagar@google.com
Review URL: http://codereview.chromium.org/7782020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer')
| -rwxr-xr-x | gpu/command_buffer/build_gles2_cmd_buffer.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py index 0384acf..90ff54a 100755 --- a/gpu/command_buffer/build_gles2_cmd_buffer.py +++ b/gpu/command_buffer/build_gles2_cmd_buffer.py @@ -5753,10 +5753,10 @@ const size_t GLES2Util::enum_to_string_table_len_ = 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 @@ -5818,7 +5818,7 @@ const size_t GLES2Util::enum_to_string_table_len_ = 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())) @@ -5828,7 +5828,7 @@ const size_t GLES2Util::enum_to_string_table_len_ = file.Write("} // namespace\n") file.Write(""" -const PPB_OpenGLES2* OpenGLES2Impl::GetInterface() { +const PPB_OpenGLES2_Dev* OpenGLES2Impl::GetInterface() { return &ppb_opengles2; } @@ -5904,10 +5904,10 @@ const PPB_OpenGLES2* OpenGLES2Impl::GetInterface() { 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 |