diff options
| author | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-19 05:54:17 +0000 |
|---|---|---|
| committer | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-19 05:54:17 +0000 |
| commit | 74345af2a98e16cd1157a74ff90aa6a95688446a (patch) | |
| tree | c60884fa51c50b79d322bcb953b17dba88024457 /third_party | |
| parent | ad117b1784c28bf1cfd80d6d7ea85079eff4019d (diff) | |
| download | chromium_src-74345af2a98e16cd1157a74ff90aa6a95688446a.zip chromium_src-74345af2a98e16cd1157a74ff90aa6a95688446a.tar.gz chromium_src-74345af2a98e16cd1157a74ff90aa6a95688446a.tar.bz2 | |
Revert 132934 - this change seems to break many webgl related layout tests
Introduction of CHROMIUM_copy_texture extension that respects pixel-store semantics, and allows copying of BGRA textures.
OpenGL ES does not natively allow for copying textures with a BGRA format. The EXT_texture_format_BGRA8888 extension does not specify support for glCopyTexImage calls on these textures.
This extension provides a routine to perform texture copies to/from BGRA-backed textures that also respects the following CHROMIUM pixel storage modifiers:
UNPACK_FLIP_Y_CHROMIUM
UNPACK_PREMULTIPLY_ALPHA_CHROMIUM
This extension will be useful for the following purposes:
- Copying accelerated Canvas2D contents to WebGL textures without a software readback. (And potentially the same for video-webgl texture copies.)
- Copying Canvas2D contents to the compositor backing store.
BUG=101051
TEST=none
Review URL: http://codereview.chromium.org/9968113
TBR=twiz@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10078006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132958 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/khronos/GLES2/gl2ext.h | 18 | ||||
| -rw-r--r-- | third_party/khronos/README.chromium | 1 |
2 files changed, 0 insertions, 19 deletions
diff --git a/third_party/khronos/GLES2/gl2ext.h b/third_party/khronos/GLES2/gl2ext.h index 8effd30..04fa4e0 100644 --- a/third_party/khronos/GLES2/gl2ext.h +++ b/third_party/khronos/GLES2/gl2ext.h @@ -1955,24 +1955,6 @@ typedef void (GL_APIENTRYP PFNGLTEXIMAGEIOSURFACE2DCHROMIUM) (GLenum target, GLs #endif #endif -/* GL_CHROMIUM_copy_texture */ -#ifndef GL_CHROMIUM_copy_texture -#ifndef GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM -#define GL_UNPACK_PREMULTIPLY_ALPHA_CHROMIUM 0x9241 -#endif -#ifndef GL_UNPACK_COLORSPACE_CONVERSION_CHROMIUM -#define GL_UNPACK_COLORSPACE_CONVERSION_CHROMIUM 0x9243 -#endif -#ifdef GL_GLEXT_PROTOTYPES -#define glCopyTextureCHROMIUM GLES2_GET_FUN(CopyTextureCHROMIUM) -#if !defined(GLES2_USE_CPP_BINDINGS) -GL_APICALL void GL_APIENTRY glCopyTextureCHROMIUM (GLenum target, GLenum source_id, GLenum dest_id, GLint level); -#endif -#else -typedef void (GL_APIENTRYP PFNGLCOPYTEXTURECHROMIUM) (GLenum target, GLenum source_id, GLenum dest_id, GLint level); -#endif -#endif - /* GL_CHROMIUM_command_buffer_query */ /* Exposes GL_CHROMIUM_command_buffer_query. */ diff --git a/third_party/khronos/README.chromium b/third_party/khronos/README.chromium index 5a67f08..fb7daee 100644 --- a/third_party/khronos/README.chromium +++ b/third_party/khronos/README.chromium @@ -21,6 +21,5 @@ GLES2/gl2ext.h - Added ANGLE_instanced_arrays - Added GL_EXT_framebuffer_multisample - Added GL_CHROMIUM_command_buffer_query - - Added GL_CHROMIUM_copy_texture EGL/eglplatform.h - Added EGLNative*Type for Mac. |