diff options
| author | twiz@chromium.org <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-04 21:13:03 +0000 |
|---|---|---|
| committer | twiz@chromium.org <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-04 21:13:03 +0000 |
| commit | 0a1e9ad53f2f7f2fc6139644da122e272b88fb80 (patch) | |
| tree | 8fb141e572f89fd34844b8381c758a286853824f /content | |
| parent | dc03f987519668bcffac2c5ecd8d85feab7aa195 (diff) | |
| download | chromium_src-0a1e9ad53f2f7f2fc6139644da122e272b88fb80.zip chromium_src-0a1e9ad53f2f7f2fc6139644da122e272b88fb80.tar.gz chromium_src-0a1e9ad53f2f7f2fc6139644da122e272b88fb80.tar.bz2 | |
Addition of a set of basic unit tests for the GL_CHROMIUM_copy_texture extension.
This change also introduces a new parameter to the extension, internal_format. This is to bring the extension closer in functionality to glCopyTexImage.
The tests uncovered state that was not being properly restored: GL_BLEND. This is also corrected.
TEST=GLCopyTextureCHROMIUMTest.*
BUG=126178
Review URL: http://codereview.chromium.org/10356004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135434 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc | 4 | ||||
| -rw-r--r-- | content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc index 5868cb9..b575103 100644 --- a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc +++ b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc @@ -1480,6 +1480,9 @@ DELEGATE_TO_GL_3(getQueryivEXT, GetQueryivEXT, WGC3Denum, WGC3Denum, WGC3Dint*) DELEGATE_TO_GL_3(getQueryObjectuivEXT, GetQueryObjectuivEXT, WebGLId, WGC3Denum, WGC3Duint*) +DELEGATE_TO_GL_5(copyTextureCHROMIUM, CopyTextureCHROMIUM, WGC3Denum, + WGC3Denum, WGC3Denum, WGC3Dint, WGC3Dint); + #if WEBKIT_USING_SKIA GrGLInterface* WebGraphicsContext3DCommandBufferImpl::onCreateGrGLInterface() { return webkit_glue::CreateCommandBufferSkiaGLBinding(); @@ -1523,4 +1526,3 @@ void WebGraphicsContext3DCommandBufferImpl::OnErrorMessage( error_message_callback_->onErrorMessage(str, id); } } - diff --git a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h index 03472a5..7e4335a 100644 --- a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h +++ b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h @@ -555,6 +555,10 @@ class WebGraphicsContext3DCommandBufferImpl 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); + protected: #if WEBKIT_USING_SKIA virtual GrGLInterface* onCreateGrGLInterface(); |