Fix gles2_conform_test failures when Mac switching to core profile

gpu/command_buffer/service/gles2_cmd_decoder.cc

 // Copyright (c) 2012 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_decoder.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
@@ skipping 881 matching lines @@
 
   // Deletes the TransformFeedback info for the given transformfeedback.
   void RemoveTransformFeedback(GLuint client_id) {
     transform_feedback_manager_->RemoveTransformFeedback(client_id);
   }
 
   // Get the size (in pixels) of the currently bound frame buffer (either FBO
   // or regular back buffer).
   gfx::Size GetBoundReadFrameBufferSize();
 
+  // Get the service side ID for the bound read frame buffer.
+  // If it's back buffer, 0 is returned.
+  GLuint GetBoundReadFrameBufferServiceId();
+
   // Get the format/type of the currently bound frame buffer (either FBO or
   // regular back buffer).
   // If the color image is a renderbuffer, returns 0 for type.
   GLenum GetBoundReadFrameBufferTextureType();
   GLenum GetBoundReadFrameBufferInternalFormat();
 
   // Get the i-th draw buffer's internal format/type from the bound framebuffer.
   // If no framebuffer is bound, or no image is attached, or the DrawBuffers
   // setting for that image is GL_NONE, return 0.
   GLenum GetBoundColorDrawBufferType(GLint drawbuffer_i);
@@ skipping 3395 matching lines @@
       return gfx::Size(attachment->width(), attachment->height());
     }
     return gfx::Size(0, 0);
   } else if (offscreen_target_frame_buffer_.get()) {
     return offscreen_size_;
   } else {
     return surface_->GetSize();
   }
 }
 
+GLuint GLES2DecoderImpl::GetBoundReadFrameBufferServiceId() {
+  Framebuffer* framebuffer =
+    GetFramebufferInfoForTarget(GL_READ_FRAMEBUFFER_EXT);
+  if (framebuffer) {
+    return framebuffer->service_id();
+  }
+  if (offscreen_resolved_frame_buffer_.get()) {
+    return offscreen_resolved_frame_buffer_->id();
+  }
+  if (offscreen_target_frame_buffer_.get()) {
+    return offscreen_target_frame_buffer_->id();
+  }
+  return 0;

[piman, 2016/08/17 20:30:45]

You need return surface_.get() ? surface_->GetBackingFrameBufferObject() : 0,
similar to GetBackbufferServiceId(), to account for surfaces that use a FBO
internally.

+}
+
 GLenum GLES2DecoderImpl::GetBoundReadFrameBufferTextureType() {
   Framebuffer* framebuffer =
     GetFramebufferInfoForTarget(GL_READ_FRAMEBUFFER_EXT);
   if (framebuffer) {
     return framebuffer->GetReadBufferTextureType();
   } else {  // Back buffer.
     if (back_buffer_read_buffer_ == GL_NONE)
       return 0;
     return GL_UNSIGNED_BYTE;
   }
@@ skipping 8689 matching lines @@
     memset(zero.get(), 0, pixels_size);
     glTexImage2D(target, level, TextureManager::AdjustTexInternalFormat(
                                     feature_info_.get(), internal_format),
                  width, height, border, format, type, zero.get());
     if (copyHeight > 0 && copyWidth > 0) {
       GLint dx = copyX - x;
       GLint dy = copyY - y;
       GLint destX = dx;
       GLint destY = dy;
       if (requires_luma_blit) {
-        copy_tex_image_blit_->DoCopyTexSubImage2DToLUMAComatabilityTexture(
+        copy_tex_image_blit_->DoCopyTexSubImage2DToLUMACompatabilityTexture(
             this, texture->service_id(), texture->target(), target, format,
             type, level, destX, destY, copyX, copyY, copyWidth, copyHeight,
-            framebuffer_state_.bound_read_framebuffer->service_id(),
-            framebuffer_state_.bound_read_framebuffer
-                ->GetReadBufferInternalFormat());
+            GetBoundReadFrameBufferServiceId(),
+            GetBoundReadFrameBufferInternalFormat());
       } else {
         glCopyTexSubImage2D(target, level, destX, destY, copyX, copyY,
                             copyWidth, copyHeight);
       }
     }
   } else {
     GLenum final_internal_format = TextureManager::AdjustTexInternalFormat(
         feature_info_.get(), internal_format);
 
     // The service id and target of the texture attached to READ_FRAMEBUFFER.
     GLuint source_texture_service_id = 0;
     GLenum source_texture_target = 0;
     uint32_t channels_exist = GLES2Util::GetChannelsForFormat(read_format);
     bool use_workaround = NeedsCopyTextureImageWorkaround(
         final_internal_format, channels_exist, &source_texture_service_id,
         &source_texture_target);
     if (requires_luma_blit) {
-      copy_tex_image_blit_->DoCopyTexImage2DToLUMAComatabilityTexture(
+      copy_tex_image_blit_->DoCopyTexImage2DToLUMACompatabilityTexture(
           this, texture->service_id(), texture->target(), target, format,
           type, level, internal_format, copyX, copyY, copyWidth, copyHeight,
-          framebuffer_state_.bound_read_framebuffer->service_id(),
-          framebuffer_state_.bound_read_framebuffer
-              ->GetReadBufferInternalFormat());
+          GetBoundReadFrameBufferServiceId(),
+          GetBoundReadFrameBufferInternalFormat());
     } else if (use_workaround) {
       GLenum dest_texture_target = target;
       GLenum framebuffer_target = features().chromium_framebuffer_multisample
                                       ? GL_READ_FRAMEBUFFER_EXT
                                       : GL_FRAMEBUFFER;
 
       GLenum temp_internal_format = 0;
       if (channels_exist == GLES2Util::kRGBA) {
         temp_internal_format = GL_RGBA;
       } else if (channels_exist == GLES2Util::kRGB) {
@@ skipping 127 matching lines @@
     // Write all pixels in below.
     texture_manager()->SetLevelCleared(texture_ref, target, level, true);
   }
 
   if (copyHeight > 0 && copyWidth > 0) {
     if (CopyTexImageResourceManager::CopyTexImageRequiresBlit(
             feature_info_.get(), internal_format)) {
       if (!InitializeCopyTexImageBlitter("glCopyTexSubImage2D")) {
         return;
       }
-      copy_tex_image_blit_->DoCopyTexSubImage2DToLUMAComatabilityTexture(
+      copy_tex_image_blit_->DoCopyTexSubImage2DToLUMACompatabilityTexture(
           this, texture->service_id(), texture->target(), target,
           internal_format, type, level, xoffset, yoffset, x, y, width, height,
-          framebuffer_state_.bound_read_framebuffer->service_id(),
-          framebuffer_state_.bound_read_framebuffer
-              ->GetReadBufferInternalFormat());
+          GetBoundReadFrameBufferServiceId(),
+          GetBoundReadFrameBufferInternalFormat());
     } else {
       glCopyTexSubImage2D(target, level, destX, destY, copyX, copyY, copyWidth,
                           copyHeight);
     }
   }
 
   // This may be a slow command.  Exit command processing to allow for
   // context preemption and GPU watchdog checks.
   ExitCommandProcessingEarly();
 }
@@ skipping 4544 matching lines @@
 }
 
 // Include the auto-generated part of this file. We split this because it means
 // we can easily edit the non-auto generated parts right here in this file
 // instead of having to edit some template or the code generator.
 #include "base/macros.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu