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 /third_party | |
| 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 'third_party')
| -rw-r--r-- | third_party/khronos/GLES2/gl2ext.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/third_party/khronos/GLES2/gl2ext.h b/third_party/khronos/GLES2/gl2ext.h index b0a6d8f..e6a728c 100644 --- a/third_party/khronos/GLES2/gl2ext.h +++ b/third_party/khronos/GLES2/gl2ext.h @@ -1960,6 +1960,9 @@ typedef void (GL_APIENTRYP PFNGLTEXIMAGEIOSURFACE2DCHROMIUM) (GLenum target, GLs #ifndef GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM #define GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM 0x9241 #endif +#ifndef GL_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM +#define GL_UNPACK_UNPREMULTIPLY_ALPHA_CHROMIUM 0x9242 +#endif #ifndef GL_UNPACK_COLORSPACE_CONVERSION_CHROMIUM #define GL_UNPACK_COLORSPACE_CONVERSION_CHROMIUM 0x9243 #endif |