gpu, cmaa: reuse CopyTextureCHROMIUMResourceManager

gpu/command_buffer/service/gles2_cmd_apply_framebuffer_attachment_cmaa_intel.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/gles2_cmd_apply_framebuffer_attachment_cmaa_intel.h"
 
 #include "base/logging.h"
 #include "gpu/command_buffer/service/framebuffer_manager.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
 #include "ui/gl/gl_context.h"
@@ skipping 167 matching lines @@
       glGetUniformLocation(edges0_shader_, "g_resultRGBATextureSlot1");
   edges0_shader_target_texture_slot2_ =
       glGetUniformLocation(edges0_shader_, "g_targetTextureSlot2");
   edges1_shader_result_edge_texture_ =
       glGetUniformLocation(edges1_shader_, "g_resultEdgeTexture");
   edges_combine_shader_result_edge_texture_ =
       glGetUniformLocation(edges_combine_shader_, "g_resultEdgeTexture");
   process_and_apply_shader_result_rgba_texture_slot1_ = glGetUniformLocation(
       process_and_apply_shader_, "g_resultRGBATextureSlot1");
 
+  copy_to_framebuffer_shader_ = CreateProgram("", vert_str_, copy_frag_str_);
+
   initialized_ = true;
 }
 
 void ApplyFramebufferAttachmentCMAAINTELResourceManager::Destroy() {
   if (!initialized_)
     return;
 
   ReleaseTextures();
 
+  glDeleteProgram(copy_to_framebuffer_shader_);
   glDeleteProgram(process_and_apply_shader_);
   glDeleteProgram(edges_combine_shader_);
   glDeleteProgram(edges1_shader_);
   glDeleteProgram(edges0_shader_);
   glDeleteProgram(debug_display_edges_shader_);
 
   initialized_ = false;
 }
 
 // Apply CMAA(Conservative Morphological Anti-Aliasing) algorithm to the
@@ skipping 31 matching lines @@
       // Resize internal structures - only if needed.
       OnSize(width, height);
 
       // CMAA internally expects GL_RGBA8 textures.
       // Process using a GL_RGBA8 copy if this is not the case.
       bool do_copy = internal_format != GL_RGBA8;
 
       // CMAA Effect
       if (do_copy) {
         ApplyCMAAEffectTexture(source_texture, rgba8_texture_, do_copy);
+        CopyTexture(rgba8_texture_, source_texture);
       } else {
         ApplyCMAAEffectTexture(source_texture, source_texture, do_copy);
       }
 
-      // Copy rgba8_texture_ to source_texture
-      if (do_copy) {
-        // copy_framebuffer_ always binds rgba8_texture_
-        glBindFramebufferEXT(GL_FRAMEBUFFER, copy_framebuffer_);
-        CopyTexture(source_texture);
-      }
       decoder->RestoreTextureState(source_texture);
     }
   }
 
   // Restore state
   decoder->RestoreAllAttributes();
   decoder->RestoreTextureUnitBindings(0);
   decoder->RestoreTextureUnitBindings(1);
   decoder->RestoreActiveTexture();
   decoder->RestoreProgramBindings();
@@ skipping 275 matching lines @@
     glDeleteTextures(1, &rgba8_texture_);
     glDeleteTextures(1, &edges0_texture_);
     glDeleteTextures(1, &edges1_texture_);
     glDeleteTextures(1, &mini4_edge_texture_);
     glDeleteTextures(1, &mini4_edge_depth_texture_);
     glDeleteTextures(1, &working_color_texture_);
   }
   textures_initialized_ = false;
 }
 
 void ApplyFramebufferAttachmentCMAAINTELResourceManager::CopyTexture(

[piman, 2016/10/28 21:51:12]

We already have a facility to copy a texture using a draw, in
CopyTextureCHROMIUMResourceManager - that is used for CopyTextureCHROMIUM

Could we use that instead, to avoid duplicating functionality? We can pass the
CopyTextureCHROMIUMResourceManager to the
ApplyFramebufferAttachmentCMAAINTELResourceManager so that it can call into it.

+    GLint source,
     GLint dest) {
-  glActiveTexture(GL_TEXTURE0);
-  glBindTexture(GL_TEXTURE_2D, dest);
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+  // glDrawArrays is faster than glCopyTexSubImage2D on IA Mesa driver,
+  // although opposite in Android. Currently, only IA ChromeOS uses this code.
+  const bool draw = true;

[dshwang, 2016/10/28 18:13:24]

Mesa may will fix it or future Intel Chromebook may have different behavior.
So I remain dead code here. It makes us to test very quickly.

+  if (draw) {
+    glBindFramebufferEXT(GL_FRAMEBUFFER, copy_framebuffer_);
+    glFramebufferTexture2DEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+                              GL_TEXTURE_2D, dest, 0);
+    glViewport(0, 0, width_, height_);
 
-  glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, width_, height_);
+    glActiveTexture(GL_TEXTURE0);
+    glBindTexture(GL_TEXTURE_2D, source);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+
+    glDisable(GL_DEPTH_TEST);
+    glDisable(GL_STENCIL_TEST);
+    glDisable(GL_CULL_FACE);
+    glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+    glDepthMask(GL_FALSE);
+    glDisable(GL_BLEND);
+    glUseProgram(copy_to_framebuffer_shader_);
+
+    glDrawArrays(GL_TRIANGLES, 0, 3);
+    glUseProgram(0);
+    glBindTexture(GL_TEXTURE_2D, 0);
+  } else {
+    // copy_framebuffer_ always binds rgba8_texture_
+    glBindFramebufferEXT(GL_FRAMEBUFFER, copy_framebuffer_);
+    glActiveTexture(GL_TEXTURE0);
+    glBindTexture(GL_TEXTURE_2D, dest);
+    glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, width_, height_);
+  }
 }
 
 GLuint ApplyFramebufferAttachmentCMAAINTELResourceManager::CreateProgram(
     const char* defines,
     const char* vs_source,
     const char* fs_source) {
   GLuint program = glCreateProgram();
 
   GLuint vs = CreateShader(GL_VERTEX_SHADER, defines, vs_source);
   GLuint fs = CreateShader(GL_FRAGMENT_SHADER, defines, fs_source);
@@ skipping 1281 matching lines @@
       CombineEdges();
     \n#endif\n
     \n#if defined BLUR_EDGES\n
       BlurEdges();
     \n#endif\n
     \n#if defined DISPLAY_EDGES\n
       DisplayEdges();
     \n#endif\n
     }
   );
+
+const char
+  ApplyFramebufferAttachmentCMAAINTELResourceManager::copy_frag_str_[] =
+    SHADER(
+      precision highp float;
+      layout(binding = 0) uniform highp sampler2D inTexture;
+      layout(location = 0) out vec4 outColor;
+      void main() {
+        ivec2 screenPosI = ivec2( gl_FragCoord.xy );
+        vec4 pixel = texelFetch(inTexture, screenPosI, 0);
+        outColor = pixel;
+      }
+    );
 /* clang-format on */
 
 }  // namespace gles2
 }  // namespace gpu