[Command buffer] blitFramebuffer should not disable scissor test

gpu/command_buffer/service/gles2_cmd_srgb_converter.cc

 // Copyright (c) 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_srgb_converter.h"
 
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "ui/gl/gl_version_info.h"
 
 namespace {
@@ skipping 167 matching lines @@
     GLint dstY1,
     GLbitfield mask,
     GLenum filter,
     const gfx::Size& framebuffer_size,
     GLuint src_framebuffer,
     GLenum src_framebuffer_internal_format,
     GLenum src_framebuffer_format,
     GLenum src_framebuffer_type,
     GLuint dst_framebuffer,
     bool decode,
-    bool encode) {
+    bool encode,
+    bool enable_scissor_test) {
   // This function blits srgb image in src fb to srgb image in dst fb.
   // The steps are:
   // 1) Copy and crop pixels from source srgb image to the 1st texture(srgb).
   // 2) Sampling from the 1st texture and drawing to the 2nd texture(linear).
   //    During this step, color space is converted from srgb to linear.
   // 3) Blit pixels from the 2nd texture to the 3rd texture(linear).
   // 4) Sampling from the 3rd texture and drawing to the dst image(srgb).
   //    During this step, color space is converted from linear to srgb.
   // If we need to blit from linear to srgb or vice versa, some steps will be
   // skipped.
@@ skipping 77 matching lines @@
         decode ? GL_RGBA : src_framebuffer_format,
         decode ? GL_UNSIGNED_BYTE : src_framebuffer_type,
         nullptr);
 
     glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER, srgb_encoder_fbo_);
     glFramebufferTexture2DEXT(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
                               GL_TEXTURE_2D, srgb_converter_textures_[0], 0);
   } else {
     // Set approriate draw framebuffer if encoding is skipped.
     glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER, dst_framebuffer);
+
+    if (enable_scissor_test) {
+      glEnable(GL_SCISSOR_TEST);
+    }
   }
 
   glBlitFramebuffer(
       decode ? (srcX0 < srcX1 ? 0 - xoffset : width_read - xoffset) : srcX0,
       decode ? (srcY0 < srcY1 ? 0 - yoffset : height_read - yoffset) : srcY0,
       decode ? (srcX0 < srcX1 ? width_read - xoffset : 0 - xoffset) : srcX1,
       decode ? (srcY0 < srcY1 ? height_read - yoffset : 0 - yoffset) : srcY1,
       encode ? (dstX0 < dstX1 ? 0 : width_draw) : dstX0,
       encode ? (dstY0 < dstY1 ? 0 : height_draw) : dstY0,
       encode ? (dstX0 < dstX1 ? width_draw : 0) : dstX1,
       encode ? (dstY0 < dstY1 ? height_draw : 0) : dstY1,
       mask, filter);
 
   // Sampling from the 3rd texture(linear) and drawing to the target srgb image.
   // During this step, color space is converted from linear to srgb. We should
   // set appropriate viewport to draw to the correct location in target FB.
   if (encode) {
     GLuint xstart = dstX0 < dstX1 ? dstX0 : dstX1;
     GLuint ystart = dstY0 < dstY1 ? dstY0 : dstY1;
     glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER, dst_framebuffer);
     glUseProgram(srgb_converter_program_);
     glViewport(xstart, ystart, width_draw, height_draw);
 
     glBindTexture(GL_TEXTURE_2D, srgb_converter_textures_[0]);
     glBindVertexArrayOES(srgb_converter_vao_);
 
+    if (enable_scissor_test) {
+      glEnable(GL_SCISSOR_TEST);
+    }
+
     glDrawArrays(GL_TRIANGLES, 0, 6);
   }
 
   // Restore state
   decoder->RestoreAllAttributes();
   decoder->RestoreTextureUnitBindings(0);
   decoder->RestoreActiveTexture();
   decoder->RestoreProgramBindings();
   decoder->RestoreBufferBindings();
   decoder->RestoreFramebufferBindings();
   decoder->RestoreGlobalState();
 }
 
 }  // namespace gles2.
 }  // namespace gpu