diff options
| author | kbr <kbr@chromium.org> | 2015-06-05 17:37:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-06 00:38:25 +0000 |
| commit | 0e8e291d8796a70363c50a11bdef62d1a7e5550e (patch) | |
| tree | 41d1ce2b248dfda21b1f7905091d1459d1d6c9c6 /gpu | |
| parent | ecce673617583e7f020518791b97dca6eeccef9e (diff) | |
| download | chromium_src-0e8e291d8796a70363c50a11bdef62d1a7e5550e.zip chromium_src-0e8e291d8796a70363c50a11bdef62d1a7e5550e.tar.gz chromium_src-0e8e291d8796a70363c50a11bdef62d1a7e5550e.tar.bz2 | |
Revert of gpu: Add GL_TEXTURE_RECTANGLE_ARB support to CopyTexSubImage2D optimization of CopyTexture. (patchset #1 id:1 of https://codereview.chromium.org/1149233005/)
Reason for revert:
May have caused WebGL conformance test failures on OS X; see http://crbug.com/486922 .
Original issue's description:
> gpu: Add GL_TEXTURE_RECTANGLE_ARB support to CopyTexSubImage2D optimization of CopyTexture.
>
> The availability of this extension is already limited to desktop core
> profile as the only reason we need to support it is IOSurfaces on
> MacOSX.
>
> This provides 2x performance improvement of copy operations when using
> IOSurface backed GpuMemoryBuffers.
>
> BUG=486922
>
> Committed: https://crrev.com/48514369cc66bc04ec766adf774de41d396a33ad
> Cr-Commit-Position: refs/heads/master@{#333159}
TBR=piman@chromium.org,dongseong.hwang@intel.com,reveman@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=486922
Review URL: https://codereview.chromium.org/1148853010
Cr-Commit-Position: refs/heads/master@{#333187}
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.cc b/gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.cc index 1df4a70..974cbd7 100644 --- a/gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.cc +++ b/gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.cc @@ -367,12 +367,12 @@ void CopyTextureCHROMIUMResourceManager::DoCopyTexture( // format of internalformat. // https://www.khronos.org/opengles/sdk/docs/man/xhtml/glCopyTexImage2D.xml bool source_format_contain_superset_of_dest_format = - source_internal_format == dest_internal_format || + (source_internal_format == dest_internal_format && + source_internal_format != GL_BGRA_EXT) || (source_internal_format == GL_RGBA && dest_internal_format == GL_RGB); - // Note: GL_TEXTURE_RECTANGLE_ARB is only available if supported on FBOs. - bool valid_source_target = source_target == GL_TEXTURE_2D || - source_target == GL_TEXTURE_RECTANGLE_ARB; - if (valid_source_target && !flip_y && !premultiply_alpha_change && + // GL_TEXTURE_RECTANGLE_ARB on FBO is supported by OpenGL, not GLES2, + // so restrict this to GL_TEXTURE_2D. + if (source_target == GL_TEXTURE_2D && !flip_y && !premultiply_alpha_change && source_format_contain_superset_of_dest_format) { DoCopyTexImage2D(decoder, source_target, @@ -417,12 +417,12 @@ void CopyTextureCHROMIUMResourceManager::DoCopySubTexture( // format of internalformat. // https://www.khronos.org/opengles/sdk/docs/man/xhtml/glCopyTexImage2D.xml bool source_format_contain_superset_of_dest_format = - source_internal_format == dest_internal_format || + (source_internal_format == dest_internal_format && + source_internal_format != GL_BGRA_EXT) || (source_internal_format == GL_RGBA && dest_internal_format == GL_RGB); - // Note: GL_TEXTURE_RECTANGLE_ARB is only available if supported on FBOs. - bool valid_source_target = source_target == GL_TEXTURE_2D || - source_target == GL_TEXTURE_RECTANGLE_ARB; - if (valid_source_target && !flip_y && !premultiply_alpha_change && + // GL_TEXTURE_RECTANGLE_ARB on FBO is supported by OpenGL, not GLES2, + // so restrict this to GL_TEXTURE_2D. + if (source_target == GL_TEXTURE_2D && !flip_y && !premultiply_alpha_change && source_format_contain_superset_of_dest_format) { DoCopyTexSubImage2D(decoder, source_target, source_id, dest_id, xoffset, yoffset, x, y, width, height, framebuffer_); |