diff options
| author | hkuang@chromium.org <hkuang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-03 03:56:25 +0000 |
|---|---|---|
| committer | hkuang@chromium.org <hkuang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-03 03:56:25 +0000 |
| commit | 9bc9a2e8141d255c8c67c6ccec1d7f09c3ce8990 (patch) | |
| tree | b80d74298e3c2e547a43b0fcc34b08ff3dffc0e7 /gpu/GLES2 | |
| parent | 065e0b187f7494948996fa60f7cfdbdc1307bb9c (diff) | |
| download | chromium_src-9bc9a2e8141d255c8c67c6ccec1d7f09c3ce8990.zip chromium_src-9bc9a2e8141d255c8c67c6ccec1d7f09c3ce8990.tar.gz chromium_src-9bc9a2e8141d255c8c67c6ccec1d7f09c3ce8990.tar.bz2 | |
Add support for GL_TEXTURE_EXTERNAL_OES texture copy.
Add support for GL_TEXTURE_EXTERNAL_OES texture copy in function CopyTextureCHROMIUM which is needed for 2D Canvas Painting. In Issue 11973010, this support was already added inside the copyTextureCHROMIUMResourceManager, but it is still missing in the function CopyTextureCHROMIUM. So just add it.
Also fix the RestoreTextureState, which was binding the OES texture to GL_TEXTURE_2D which will generate glError.
BUG=225079
TEST=
Review URL: https://chromiumcodereview.appspot.com/13168004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191968 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/GLES2')
| -rw-r--r-- | gpu/GLES2/extensions/CHROMIUM/CHROMIUM_copy_texture.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_copy_texture.txt b/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_copy_texture.txt index 57085b9..5d346bc 100644 --- a/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_copy_texture.txt +++ b/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_copy_texture.txt @@ -8,7 +8,7 @@ Name Strings Version - Last Modifed Date: April 3, 2012 + Last Modifed Date: April 1, 2013 Dependencies @@ -30,7 +30,8 @@ Overview 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 + The extension also supports copying BGRA textures and copying + EXTERNAL_OES texture to BGRA texture, which is not explicitly granted by EXT_texture_format_BGRA8888. New Procedures and Functions @@ -55,8 +56,11 @@ New Procedures and Functions INVALID_VALUE is generated if <source_id> or <dest_id> are not valid texture objects. - INVALID_VALUE is generated if textures corresponding to <source_id> and - <dest_id> have not been bound as GL_TEXTURE_2D objects. + INVALID_VALUE is generated if textures corresponding to <dest_id> have not + been bound as GL_TEXTURE_2D object. + + INVALID_VALUE is generated if textures corresponding to <source_id> have not + been bound as GL_TEXTURE_2D or GL_TEXTURE_EXTERNAL_OES objects. INVALID_VALUE is generated if <level> is not a valid level of the destination texture, or if level 0 of the source texture is not defined. |