Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(186)

Unified Diff: gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.cc

Issue 2695833003: Revert of Select correct copy method for DoCopySubTexture (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.cc
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 bbfdda122e9c455ba9f67c0b9bc959cda32c43a2..e3c9d86f9446874920004827840f5e3c820e6fbe 100644
--- a/gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.cc
+++ b/gpu/command_buffer/service/gles2_cmd_copy_texture_chromium.cc
@@ -796,13 +796,21 @@
bool premultiply_alpha,
bool unpremultiply_alpha,
CopyTextureMethod method) {
+ bool use_gl_copy_tex_sub_image_2d = true;
+#if defined(OS_CHROMEOS) && defined(ARCH_CPU_X86_FAMILY)
+ // glDrawArrays is faster than glCopyTexSubImage2D on IA Mesa driver,
+ // although opposite in Android.
+ // TODO(dshwang): After Mesa fixes this issue, remove this hack.
+ // https://bugs.freedesktop.org/show_bug.cgi?id=98478 crbug.com/535198
+ use_gl_copy_tex_sub_image_2d = false;
+#endif
bool premultiply_alpha_change = premultiply_alpha ^ unpremultiply_alpha;
GLenum dest_binding_target =
gpu::gles2::GLES2Util::GLFaceTargetToTextureTarget(dest_target);
// GL_TEXTURE_RECTANGLE_ARB on FBO is supported by OpenGL, not GLES2,
// so restrict this to GL_TEXTURE_2D and GL_TEXTURE_CUBE_MAP.
- if (source_target == GL_TEXTURE_2D &&
+ if (use_gl_copy_tex_sub_image_2d && source_target == GL_TEXTURE_2D &&
(dest_binding_target == GL_TEXTURE_2D ||
dest_binding_target == GL_TEXTURE_CUBE_MAP) &&
!flip_y && !premultiply_alpha_change && method == DIRECT_COPY) {

Powered by Google App Engine
This is Rietveld 408576698