Fix formats mismatch in validate_multisample_buffer_allocation

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 2332 matching lines @@
   bool gpu_debug_commands_;
 
   std::queue<FenceCallback> pending_readpixel_fences_;
 
   // After a second fence is inserted, both the GpuChannelMessageQueue and
   // CommandExecutor are descheduled. Once the first fence has completed, both
   // get rescheduled.
   std::vector<std::unique_ptr<gl::GLFence>> deschedule_until_finished_fences_;
 
   // Used to validate multisample renderbuffers if needed
-  GLuint validation_texture_;
+  typedef base::hash_map<GLenum, GLuint> TextureMap;
+  TextureMap validation_textures_;
   GLuint validation_fbo_multisample_;
   GLuint validation_fbo_;
 
   typedef gpu::gles2::GLES2Decoder::Error (GLES2DecoderImpl::*CmdHandler)(
       uint32_t immediate_data_size,
       const volatile void* data);
 
   // A struct to hold info about each command.
   struct CommandInfo {
     CmdHandler cmd_handler;
@@ skipping 626 matching lines @@
       service_logging_(
           group_->gpu_preferences().enable_gpu_service_logging_gpu),
       viewport_max_width_(0),
       viewport_max_height_(0),
       texture_state_(group_->feature_info()->workarounds()),
       gpu_decoder_category_(TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(
           TRACE_DISABLED_BY_DEFAULT("gpu_decoder"))),
       gpu_trace_level_(2),
       gpu_trace_commands_(false),
       gpu_debug_commands_(false),
-      validation_texture_(0),
       validation_fbo_multisample_(0),
       validation_fbo_(0),
       texture_manager_service_id_generation_(0),
       force_shader_name_hashing_for_test(false) {
   DCHECK(group);
 }
 
 GLES2DecoderImpl::~GLES2DecoderImpl() {
 }
 
@@ skipping 1599 matching lines @@
                                       state_.current_program.get());
     }
 
     if (attrib_0_buffer_id_) {
       glDeleteBuffersARB(1, &attrib_0_buffer_id_);
     }
     if (fixed_attrib_buffer_id_) {
       glDeleteBuffersARB(1, &fixed_attrib_buffer_id_);
     }
 
-    if (validation_texture_) {
-      glDeleteTextures(1, &validation_texture_);
+    if (validation_fbo_) {
       glDeleteFramebuffersEXT(1, &validation_fbo_multisample_);
       glDeleteFramebuffersEXT(1, &validation_fbo_);
     }
+    while (!validation_textures_.empty()) {
+      GLuint tex;
+      tex = validation_textures_.begin()->second;
+      glDeleteTextures(1, &tex);
+      validation_textures_.erase(validation_textures_.begin());
+    }
 
     if (offscreen_target_frame_buffer_.get())
       offscreen_target_frame_buffer_->Destroy();
     if (offscreen_target_color_texture_.get())
       offscreen_target_color_texture_->Destroy();
     if (offscreen_target_color_render_buffer_.get())
       offscreen_target_color_render_buffer_->Destroy();
     if (offscreen_target_depth_render_buffer_.get())
       offscreen_target_depth_render_buffer_->Destroy();
     if (offscreen_target_stencil_render_buffer_.get())
@@ skipping 3215 matching lines @@
 // by clearing it to a key color, blitting the contents to a texture, and
 // reading back the color to ensure it matches the key.
 bool GLES2DecoderImpl::VerifyMultisampleRenderbufferIntegrity(
     GLuint renderbuffer, GLenum format) {
 
   // Only validate color buffers.
   // These formats have been selected because they are very common or are known
   // to be used by the WebGL backbuffer. If problems are observed with other
   // color formats they can be added here.
   switch (format) {
     case GL_RGB:

[Zhenyao Mo, 2016/09/09 18:53:51]

This is incorrect. Can you fix it? RGB and RGBA are not valid format for
renderbuffer.

     case GL_RGB8:
     case GL_RGBA:
     case GL_RGBA8:
       break;
     default:
       return true;
   }
 
   GLint draw_framebuffer, read_framebuffer;
 
   // Cache framebuffer and texture bindings.
   glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &draw_framebuffer);
   glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &read_framebuffer);
 
-  if (!validation_texture_) {
-    GLint bound_texture;
-    glGetIntegerv(GL_TEXTURE_BINDING_2D, &bound_texture);
-
-    // Create additional resources needed for the verification.
-    glGenTextures(1, &validation_texture_);
+  if (!validation_fbo_) {
     glGenFramebuffersEXT(1, &validation_fbo_multisample_);
     glGenFramebuffersEXT(1, &validation_fbo_);
+  }
+
+  GLint bound_texture;
+  glGetIntegerv(GL_TEXTURE_BINDING_2D, &bound_texture);
+  GLuint validation_texture;
+  TextureMap::iterator iter = validation_textures_.find(format);
+  if (iter == validation_textures_.end()) {
+    // Create additional resources needed for the verification.
+    glGenTextures(1, &validation_texture);
+    validation_textures_.insert(std::make_pair(format, validation_texture));
 
     // Texture only needs to be 1x1.
-    glBindTexture(GL_TEXTURE_2D, validation_texture_);
-    // TODO(erikchen): When Chrome on Mac is linked against an OSX 10.9+ SDK, a
-    // multisample will fail if the color format of the source and destination
-    // do not match. Here, we assume that the source is GL_RGBA, and make the
-    // destination GL_RGBA. http://crbug.com/484203
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA,
-        GL_UNSIGNED_BYTE, NULL);
-
-    glBindFramebufferEXT(GL_FRAMEBUFFER, validation_fbo_);
-    glFramebufferTexture2DEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-        GL_TEXTURE_2D, validation_texture_, 0);
-
-    glBindTexture(GL_TEXTURE_2D, bound_texture);
+    glBindTexture(GL_TEXTURE_2D, validation_texture);
+    glTexStorage2DEXT(GL_TEXTURE_2D, 1, format, 1, 1);
+  } else {
+    validation_texture = iter->second;
   }
+  glBindFramebufferEXT(GL_FRAMEBUFFER, validation_fbo_);
+  glFramebufferTexture2DEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+      GL_TEXTURE_2D, validation_texture, 0);
+  glBindTexture(GL_TEXTURE_2D, bound_texture);
 
   glBindFramebufferEXT(GL_FRAMEBUFFER, validation_fbo_multisample_);
   glFramebufferRenderbufferEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
       GL_RENDERBUFFER, renderbuffer);
 
   // Cache current state and reset it to the values we require.
   GLboolean scissor_enabled = false;
   glGetBooleanv(GL_SCISSOR_TEST, &scissor_enabled);
   if (scissor_enabled)
     state_.SetDeviceCapabilityState(GL_SCISSOR_TEST, false);
@@ skipping 10025 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