diff options
| author | twiz@chromium.org <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-09 15:41:51 +0000 |
|---|---|---|
| committer | twiz@chromium.org <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-09 15:41:51 +0000 |
| commit | d191b1348b1c91bbe460a1fccc589c1f58a02612 (patch) | |
| tree | 53a133e8192f2f912a79a10c093953888ee092d4 /webkit | |
| parent | 9669d208e806b13b34973924d9e3c31c9e21528c (diff) | |
| download | chromium_src-d191b1348b1c91bbe460a1fccc589c1f58a02612.zip chromium_src-d191b1348b1c91bbe460a1fccc589c1f58a02612.tar.gz chromium_src-d191b1348b1c91bbe460a1fccc589c1f58a02612.tar.bz2 | |
Addition of texture-state and fbo-state tests for GL_CHROMIUM_copy_texture.
Also addressing post-commit feedback on issue: https://chromiumcodereview.appspot.com/10356004/
TEST=GLCopyTextureCHROMIUMTest.*
BUG=126178
Review URL: https://chromiumcodereview.appspot.com/10377046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136035 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
4 files changed, 8 insertions, 7 deletions
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc index 2a69029..49c3335 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc +++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc @@ -1595,7 +1595,7 @@ DELEGATE_TO_GL_3(getQueryObjectuivEXT, GetQueryObjectuivEXT, WebGLId, WGC3Denum, WGC3Duint*) DELEGATE_TO_GL_5(copyTextureCHROMIUM, CopyTextureCHROMIUM, WGC3Denum, - WGC3Denum, WGC3Denum, WGC3Dint, WGC3Dint) + WebGLId, WebGLId, WGC3Dint, WGC3Denum) #if WEBKIT_USING_SKIA GrGLInterface* WebGraphicsContext3DInProcessCommandBufferImpl:: diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h index dd6b820..ffab6a2 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h +++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h @@ -475,9 +475,9 @@ class WebGraphicsContext3DInProcessCommandBufferImpl virtual void getQueryObjectuivEXT( WebGLId query, WGC3Denum pname, WGC3Duint* params); - virtual void copyTextureCHROMIUM(WGC3Denum target, WGC3Denum source_id, - WGC3Denum dest_id, WGC3Dint level, - WGC3Dint internal_format); + virtual void copyTextureCHROMIUM(WGC3Denum target, WebGLId source_id, + WebGLId dest_id, WGC3Dint level, + WGC3Denum internal_format); protected: #if WEBKIT_USING_SKIA diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc index c13fd94..0b9bbc9 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc +++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc @@ -1672,7 +1672,7 @@ DELEGATE_TO_GL_3(getQueryObjectuivEXT, GetQueryObjectuivARB, WebGLId, WGC3Denum, WGC3Duint*) void WebGraphicsContext3DInProcessImpl::copyTextureCHROMIUM( - WGC3Denum, WGC3Denum, WGC3Denum, WGC3Dint) + WGC3Denum, WebGLId, WebGLId, WGC3Dint, WGC3Denum) { } diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.h b/webkit/gpu/webgraphicscontext3d_in_process_impl.h index c34c404..43163a4 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_impl.h +++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.h @@ -472,8 +472,9 @@ class WebGraphicsContext3DInProcessImpl : public WebGraphicsContext3D { virtual void getQueryObjectuivEXT( WebGLId query, WGC3Denum pname, WGC3Duint* params); - virtual void copyTextureCHROMIUM(WGC3Denum target, WGC3Denum source_id, - WGC3Denum dest_id, WGC3Dint level); + virtual void copyTextureCHROMIUM(WGC3Denum target, WebGLId source_id, + WebGLId dest_id, WGC3Dint level, + WGC3Denum internal_format); protected: #if WEBKIT_USING_SKIA |