diff options
| author | twiz@chromium.org <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-19 15:43:17 +0000 |
|---|---|---|
| committer | twiz@chromium.org <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-19 15:43:17 +0000 |
| commit | 6c75c71e79b70dcf32982b1da3e219c277872162 (patch) | |
| tree | e815368906a055004f7273b3c7119764f48689e0 /webkit | |
| parent | a9377f622db492fbf08fc12eac9d504bb5a4a8b7 (diff) | |
| download | chromium_src-6c75c71e79b70dcf32982b1da3e219c277872162.zip chromium_src-6c75c71e79b70dcf32982b1da3e219c277872162.tar.gz chromium_src-6c75c71e79b70dcf32982b1da3e219c277872162.tar.bz2 | |
Addition of an unpremultiplied-alpha setting for the GL_CHROMIUM_copy_texture command buffer GL extension.
The extension needs to support the ability to unpremultiply the source of the copy because of the canvas2d-webgl texture use case. Canvas is stored in premultiplied form, yet WebGL expects texture contents to be in unpremultiplied form.
Change also includes conversion of argument types to overriders of WebGraphicsContext3D::copyTextureCHROMIUM(...).
This change is necessary as a result of a wk-change: https://bugs.webkit.org/show_bug.cgi?id=86275
BUG=101051
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10535174
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142962 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
4 files changed, 8 insertions, 8 deletions
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc index a2a9d39..91a37a5 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc +++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc @@ -1621,8 +1621,8 @@ 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, - WebGLId, WebGLId, WGC3Dint, WGC3Denum) +DELEGATE_TO_GL_5(copyTextureCHROMIUM, CopyTextureCHROMIUM, WGC3Denum, WGC3Duint, + WGC3Duint, WGC3Dint, WGC3Denum) GrGLInterface* WebGraphicsContext3DInProcessCommandBufferImpl:: onCreateGrGLInterface() { diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h index 9bef4a9..0fc140a 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h +++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h @@ -475,8 +475,8 @@ class WebGraphicsContext3DInProcessCommandBufferImpl virtual void getQueryObjectuivEXT( WebGLId query, WGC3Denum pname, WGC3Duint* params); - virtual void copyTextureCHROMIUM(WGC3Denum target, WebGLId source_id, - WebGLId dest_id, WGC3Dint level, + virtual void copyTextureCHROMIUM(WGC3Denum target, WGC3Duint source_id, + WGC3Duint dest_id, WGC3Dint level, WGC3Denum internal_format); protected: diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc index a6ccfb4..f37cd363 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_impl.cc +++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.cc @@ -1672,8 +1672,8 @@ DELEGATE_TO_GL_3(getQueryObjectuivEXT, GetQueryObjectuivARB, WebGLId, WGC3Denum, WGC3Duint*) void WebGraphicsContext3DInProcessImpl::copyTextureCHROMIUM( - WGC3Denum, WebGLId, WebGLId, WGC3Dint, WGC3Denum) -{ + WGC3Denum, WGC3Duint, WGC3Duint, WGC3Dint, WGC3Denum) { + NOTIMPLEMENTED(); } GrGLInterface* WebGraphicsContext3DInProcessImpl::onCreateGrGLInterface() { diff --git a/webkit/gpu/webgraphicscontext3d_in_process_impl.h b/webkit/gpu/webgraphicscontext3d_in_process_impl.h index cc3dc25..3579d90 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_impl.h +++ b/webkit/gpu/webgraphicscontext3d_in_process_impl.h @@ -472,8 +472,8 @@ class WebGraphicsContext3DInProcessImpl : public WebGraphicsContext3D { virtual void getQueryObjectuivEXT( WebGLId query, WGC3Denum pname, WGC3Duint* params); - virtual void copyTextureCHROMIUM(WGC3Denum target, WebGLId source_id, - WebGLId dest_id, WGC3Dint level, + virtual void copyTextureCHROMIUM(WGC3Denum target, WGC3Duint source_id, + WGC3Duint dest_id, WGC3Dint level, WGC3Denum internal_format); protected: |