Fix TexImage2D clearing too agressively

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 <stdio.h>
 
 #include <algorithm>
 #include <list>
@@ skipping 113 matching lines @@
 const CommandInfo g_command_info[] = {
   #define GLES2_CMD_OP(name) {                                            \
     name::kArgFlags,                                                      \
     sizeof(name) / sizeof(CommandBufferEntry) - 1, },  /* NOLINT */       \
 
   GLES2_COMMAND_LIST(GLES2_CMD_OP)
 
   #undef GLES2_CMD_OP
 };
 
-static bool IsAngle() {
-#if defined(OS_WIN)
-  return gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2;
-#else
-  return false;
-#endif
-}
-
 // Return true if a character belongs to the ASCII subset as defined in
 // GLSL ES 1.0 spec section 3.1.
 static bool CharacterIsValidForGLES(unsigned char c) {
   // Printing characters are valid except " $ ` @ \ ' DEL.
   if (c >= 32 && c <= 126 &&
       c != '"' &&
       c != '$' &&
       c != '`' &&
       c != '@' &&
       c != '\\' &&
@@ skipping 349 matching lines @@
 }
 
 GLES2Decoder::GLES2Decoder()
     : debug_(false),
       log_commands_(false) {
 }
 
 GLES2Decoder::~GLES2Decoder() {
 }
 
+bool GLES2Decoder::testing_force_is_angle_;
+
+void GLES2Decoder::set_testing_force_is_angle(bool force) {
+  testing_force_is_angle_ = force;
+}
+
+bool GLES2Decoder::IsAngle() {
+#if defined(OS_WIN)
+  return testing_force_is_angle_ ||
+         gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2;
+#else
+  return testing_force_is_angle_;
+#endif
+}
+
 // This class implements GLES2Decoder so we don't have to expose all the GLES2
 // cmd stuff to outside this class.
 class GLES2DecoderImpl : public base::SupportsWeakPtr<GLES2DecoderImpl>,
                          public GLES2Decoder {
  public:
   explicit GLES2DecoderImpl(ContextGroup* group);
   ~GLES2DecoderImpl();
 
   // Overridden from AsyncAPIInterface.
   virtual Error DoCommand(unsigned int command,
@@ skipping 1078 matching lines @@
       }
     }
     targetid = decoder_->offscreen_resolved_frame_buffer_->id();
   } else {
     targetid = decoder_->offscreen_saved_frame_buffer_->id();
   }
   glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, targetid);
   const int width = decoder_->offscreen_size_.width();
   const int height = decoder_->offscreen_size_.height();
   glDisable(GL_SCISSOR_TEST);
-  if (IsAngle()) {
+  if (GLES2Decoder::IsAngle()) {
     glBlitFramebufferANGLE(0, 0, width, height, 0, 0, width, height,
                            GL_COLOR_BUFFER_BIT, GL_NEAREST);
   } else {
     glBlitFramebufferEXT(0, 0, width, height, 0, 0, width, height,
                          GL_COLOR_BUFFER_BIT, GL_NEAREST);
   }
   glBindFramebufferEXT(GL_FRAMEBUFFER, targetid);
 }
 
 ScopedResolvedFrameBufferBinder::~ScopedResolvedFrameBufferBinder() {
@@ skipping 119 matching lines @@
 bool RenderBuffer::AllocateStorage(const gfx::Size& size, GLenum format,
                                    GLsizei samples) {
   ScopedGLErrorSuppressor suppressor(decoder_);
   ScopedRenderBufferBinder binder(decoder_, id_);
   if (samples <= 1) {
     glRenderbufferStorageEXT(GL_RENDERBUFFER,
                              format,
                              size.width(),
                              size.height());
   } else {
-    if (IsAngle()) {
+    if (GLES2Decoder::IsAngle()) {
       glRenderbufferStorageMultisampleANGLE(GL_RENDERBUFFER,
                                             samples,
                                             format,
                                             size.width(),
                                             size.height());
     } else {
       glRenderbufferStorageMultisampleEXT(GL_RENDERBUFFER,
                                           samples,
                                           format,
                                           size.width(),
@@ skipping 4792 matching lines @@
 
   if (info->IsAttachedToFramebuffer()) {
     state_dirty_ = true;
     // TODO(gman): If textures tracked which framebuffers they were attached to
     // we could just mark those framebuffers as not complete.
     framebuffer_manager()->IncFramebufferStateChangeCount();
   }
 
   if (!teximage2d_faster_than_texsubimage2d_ && level_is_same && pixels) {
     glTexSubImage2D(target, level, 0, 0, width, height, format, type, pixels);
+    texture_manager()->SetLevelCleared(info, target, level);
     tex_image_2d_failed_ = false;
     return error::kNoError;
   }
 
   CopyRealGLErrorsToWrapper();
   WrappedTexImage2D(
       target, level, internal_format, width, height, border, format, type,
       pixels);
   GLenum error = PeekGLError();
   if (error == GL_NO_ERROR) {
@@ skipping 1435 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 "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu