summaryrefslogtreecommitdiffstats
path: root/gpu/GLES2
diff options
context:
space:
mode:
authortwiz@chromium.org <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-19 15:43:17 +0000
committertwiz@chromium.org <twiz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-19 15:43:17 +0000
commit6c75c71e79b70dcf32982b1da3e219c277872162 (patch)
treee815368906a055004f7273b3c7119764f48689e0 /gpu/GLES2
parenta9377f622db492fbf08fc12eac9d504bb5a4a8b7 (diff)
downloadchromium_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 'gpu/GLES2')
-rw-r--r--gpu/GLES2/extensions/CHROMIUM/CHROMIUM_copy_texture.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_copy_texture.txt b/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_copy_texture.txt
index 0b22f6b..57085b9 100644
--- a/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_copy_texture.txt
+++ b/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_copy_texture.txt
@@ -23,7 +23,12 @@ Overview
glCopyTexImage2D command. A new function is exported,
glCopyTextureCHROMIUM, that performs the same copy operation as
glCopyTexImage2D, while respecting the pixel-storage modifiers
- UNPACK_FLIP_Y_CHROMIUM and GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM.
+ UNPACK_FLIP_Y_CHROMIUM, GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM and
+ GL_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM.
+
+ If GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM and
+ GL_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM are enabled. Then no alpha
+ processing occurs. This is the equivalent of having neither flag set.
The extension also supports copying BGRA textures, which is not explicitly
granted by EXT_texture_format_BGRA8888.