summaryrefslogtreecommitdiffstats
path: root/gpu/GLES2
diff options
context:
space:
mode:
authorjmadill <jmadill@chromium.org>2015-09-04 12:08:41 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-04 19:09:32 +0000
commit8ff8391503975e2559bf14e544b6aa469f612d25 (patch)
tree00a518334caad81e13949c02497ba1bc4587dd27 /gpu/GLES2
parent1bb1a458aea6681d0c3d55241b030732f4a61b12 (diff)
downloadchromium_src-8ff8391503975e2559bf14e544b6aa469f612d25.zip
chromium_src-8ff8391503975e2559bf14e544b6aa469f612d25.tar.gz
chromium_src-8ff8391503975e2559bf14e544b6aa469f612d25.tar.bz2
Revert of gpu: support GL_TEXTURE_CUBE_MAP destination target to Copy(Sub)TextureCHROMIUM. (patchset #10 id:200001 of https://codereview.chromium.org/1275773003/ )
Reason for revert: Linux AMD GPU FYI bot has a broken gl_tests, likely because of this patch. http://build.chromium.org/p/chromium.gpu.fyi/builders/Linux%20Release%20%28ATI%29/builds/41273 [ RUN ] GLCopyTextureCHROMIUMTests/GLCopyTextureCHROMIUMTest.Basic/2 Received signal 11 SEGV_MAPERR 000000000045 #0 0x000000492795 base::debug::(anonymous namespace)::StackDumpSignalHandler() #1 0x7ff52630acb0 <unknown> #2 0x7ff5232a858c <unknown> #3 0x7ff5230a247c <unknown> #4 0x7ff5230a33ae <unknown> #5 0x7ff5227e8585 <unknown> #6 0x7ff5227e9b0a <unknown> #7 0x7ff522bf75c3 <unknown> #8 0x0000004f7ba4 gfx::GLApiBase::glCopyTexImage2DFn() #9 0x000000596ac1 (anonymous namespace)::DoCopyTexImage2D() #10 0x0000005968c4 gpu::CopyTextureCHROMIUMResourceManager::DoCopyTexture() Original issue's description: > gpu: support GL_TEXTURE_CUBE_MAP destination target to Copy(Sub)TextureCHROMIUM. > > It makes it possible to optimize WebGL. > > TEST=gl_tests GLCopyTextureCHROMIUMTests/GLCopyTextureCHROMIUMTest.* > BUG=517548 > > Committed: https://crrev.com/fa25f0e5786527e63c6ff9aeda77da3bd7456ee3 > Cr-Commit-Position: refs/heads/master@{#347354} TBR=piman@chromium.org,sievers@chromium.org,kbr@chromium.org,zmo@chromium.org,dongseong.hwang@intel.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=517548,528374 Review URL: https://codereview.chromium.org/1304103005 Cr-Commit-Position: refs/heads/master@{#347465}
Diffstat (limited to 'gpu/GLES2')
-rw-r--r--gpu/GLES2/extensions/CHROMIUM/CHROMIUM_copy_texture.txt16
1 files changed, 3 insertions, 13 deletions
diff --git a/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_copy_texture.txt b/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_copy_texture.txt
index 8329a2d..101c0f6 100644
--- a/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_copy_texture.txt
+++ b/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_copy_texture.txt
@@ -84,19 +84,13 @@ New Procedures and Functions
INVALID_OPERATION is generated if the internal format of <source_id> is not one of
formats from the table above.
- INVALID_VALUE is generated if <target> is not GL_TEXTURE_2D,
- GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
- GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y,
- GL_TEXTURE_CUBE_MAP_POSITIVE_Z, or GL_TEXTURE_CUBE_MAP_NEGATIVE_Z.
+ INVALID_VALUE is generated if <target> is not GL_TEXTURE_2D.
INVALID_VALUE is generated if <source_id> or <dest_id> are not valid texture
objects.
INVALID_VALUE is generated if textures corresponding to <dest_id> have not
- been bound as GL_TEXTURE_2D or GL_TEXTURE_CUBE_MAP object.
-
- INVALID_VALUE is generated if the bound target of textures corresponding to
- <dest_id> doesn't match <target>.
+ 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, GL_TEXTURE_RECTANGLE_ARB or
@@ -134,10 +128,7 @@ New Procedures and Functions
INVALID_OPERATION is generated if source internal_format and destination
internal_format are not one of the valid formats described above.
- INVALID_VALUE is generated if <target> is not GL_TEXTURE_2D,
- GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
- GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y,
- GL_TEXTURE_CUBE_MAP_POSITIVE_Z, or GL_TEXTURE_CUBE_MAP_NEGATIVE_Z.
+ INVALID_VALUE is generated if <target> is not GL_TEXTURE_2D.
INVALID_OPERATION is generated if the destination texture has not been
defined.
@@ -179,4 +170,3 @@ Revision History
16/7/2014 Add GL_TEXTURE_RECTANGLE_ARB as valid source_id target
19/6/2015 Add arguments unpack_flip_y, unpack_premultiply_alpha, and
unpack_unmultiply_alpha to both commands.
- 6/8/2015 support GL_TEXTURE_CUBE_MAP destination target.