| commit | 46305b130beb809b98d02830c857dc3dfaf5b98b | [log] [tgz] |
|---|---|---|
| author | dongseong.hwang <[email protected]> | Thu Mar 05 18:28:04 2015 |
| committer | Commit bot <[email protected]> | Thu Mar 05 18:28:55 2015 |
| tree | d8d8b0ac262188390fd5d62e615b0ee3072feaae | |
| parent | a8e635214679c50b9010d925d083f8e54b13ba92 [diff] [blame] |
Reland of Revert of gpu: introduce glCopySubTextureCHROMIUM (patchset #1 id:1 of https://codereview.chromium.org/972833004/) Reason for revert: Fix OSX failure. glValidateProgram() in OSX has very strange behavior. It validates FBO unexpectedly. So glValidateProgram() falsely fails if FBO is not bound. Move the validation code after FBO binding. In addition, previous patch hits one-copy performance badly because CopySubTextureCHROMIUM didn't use image copy optimization like CopyTextureCHROMIUM. This CL applied it. Original issue's description: > Revert of gpu: introduce glCopySubTextureCHROMIUM (patchset #4 id:80001 of https://codereview.chromium.org/864513004/) > > Reason for revert: > This broke telemetry_unittests and content_browsertests on Mac (see issue 463439) > > Original issue's description: > > gpu: introduce glCopySubTextureCHROMIUM > > > > Introduce glCopySubTextureCHROMIUM to support immutable texture as well as to > > optimize WebGL texSubImage2D(video | canvas). > > > > This CL changes gl_renderer to use glCopySubTextureCHROMIUM because the > > destination texture is immutable. > > > > TEST=GLCopyTextureCHROMIUMTest > > BUG=443151 > > > > Committed: https://crrev.com/fac6a2d44323ad51429ee728e241fe22242f5ebd > > Cr-Commit-Position: refs/heads/master@{#318855} > > [email protected],[email protected],[email protected],[email protected],[email protected],[email protected] > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=443151 > > Review URL: https://codereview.chromium.org/972833004 > > Cr-Commit-Position: refs/heads/master@{#318858} BUG=443151, 463439 Review URL: https://codereview.chromium.org/977853002 Cr-Commit-Position: refs/heads/master@{#319288}
diff --git a/gpu/GLES2/gl2chromium_autogen.h b/gpu/GLES2/gl2chromium_autogen.h index af745c1..60404dcc 100644 --- a/gpu/GLES2/gl2chromium_autogen.h +++ b/gpu/GLES2/gl2chromium_autogen.h
@@ -279,6 +279,7 @@ #define glPostSubBufferCHROMIUM GLES2_GET_FUN(PostSubBufferCHROMIUM) #define glTexImageIOSurface2DCHROMIUM GLES2_GET_FUN(TexImageIOSurface2DCHROMIUM) #define glCopyTextureCHROMIUM GLES2_GET_FUN(CopyTextureCHROMIUM) +#define glCopySubTextureCHROMIUM GLES2_GET_FUN(CopySubTextureCHROMIUM) #define glDrawArraysInstancedANGLE GLES2_GET_FUN(DrawArraysInstancedANGLE) #define glDrawElementsInstancedANGLE GLES2_GET_FUN(DrawElementsInstancedANGLE) #define glVertexAttribDivisorANGLE GLES2_GET_FUN(VertexAttribDivisorANGLE)