diff options
| author | neb@chromium.org <neb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-17 21:50:19 +0000 |
|---|---|---|
| committer | neb@chromium.org <neb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-17 21:50:19 +0000 |
| commit | b84f94863b54bf22f33fe8d27bb2bb4e27aa212e (patch) | |
| tree | ae9f73091738924b9e15f7970f522842a3934e1c /webkit/glue | |
| parent | f4bcda7c870a1725e31152c86811cec2b282432b (diff) | |
| download | chromium_src-b84f94863b54bf22f33fe8d27bb2bb4e27aa212e.zip chromium_src-b84f94863b54bf22f33fe8d27bb2bb4e27aa212e.tar.gz chromium_src-b84f94863b54bf22f33fe8d27bb2bb4e27aa212e.tar.bz2 | |
Update cmd buffer script to reflect ppapi reorg.
Someone moved the files in PPAPI around and hand-modified autogenerated files.
This CL moves the change to the .py file used to generate them.
BUG=none
TEST=generated files identical to hand-modified version.
Review URL: http://codereview.chromium.org/5147003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66520 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/plugins/pepper_graphics_3d_gl.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/webkit/glue/plugins/pepper_graphics_3d_gl.cc b/webkit/glue/plugins/pepper_graphics_3d_gl.cc index 2ce8de0..6c301e4 100644 --- a/webkit/glue/plugins/pepper_graphics_3d_gl.cc +++ b/webkit/glue/plugins/pepper_graphics_3d_gl.cc @@ -550,8 +550,13 @@ void* MapTexSubImage2D( void UnmapTexSubImage2D(const void* mem) { Graphics3D::GetCurrent()->impl()->UnmapTexSubImage2D(mem); } +void CopyTextureToParentTexture( + GLuint client_child_id, GLuint client_parent_id) { + Graphics3D::GetCurrent()->impl()->CopyTextureToParentTexture( + client_child_id, client_parent_id); +} -const PPB_OpenGLES_Dev ppb_opengles = { +const struct PPB_OpenGLES_Dev ppb_opengles = { &ActiveTexture, &AttachShader, &BindAttribLocation, @@ -703,7 +708,8 @@ const PPB_OpenGLES_Dev ppb_opengles = { &MapBufferSubData, &UnmapBufferSubData, &MapTexSubImage2D, - &UnmapTexSubImage2D + &UnmapTexSubImage2D, + &CopyTextureToParentTexture }; } // namespace |