Revert "Workaround for Qualcomm renderbuffer resize bug"

gpu/command_buffer/service/renderbuffer_manager.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/renderbuffer_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/format_macros.h"
@@ skipping 85 matching lines @@
 
 void Renderbuffer::SetInfoAndInvalidate(GLsizei samples,
                                         GLenum internalformat,
                                         GLsizei width,
                                         GLsizei height) {
   samples_ = samples;
   internal_format_ = internalformat;
   width_ = width;
   height_ = height;
   cleared_ = false;
-  allocated_ = true;
   for (auto& point : framebuffer_attachment_points_) {
     point.first->UnmarkAsComplete();
   }
 }
 
 void Renderbuffer::AddToSignature(std::string* signature) const {
   DCHECK(signature);
   RenderbufferSignature signature_data(internal_format_,
                                        samples_,
                                        width_,
                                        height_);
 
   signature->append(RenderbufferTag, sizeof(RenderbufferTag));
   signature->append(reinterpret_cast<const char*>(&signature_data),
                     sizeof(signature_data));
 }
 
 Renderbuffer::Renderbuffer(RenderbufferManager* manager,
                            GLuint client_id,
                            GLuint service_id)
     : manager_(manager),
       client_id_(client_id),
       service_id_(service_id),
       cleared_(true),
-      allocated_(false),
       has_been_bound_(false),
       samples_(0),
       internal_format_(GL_RGBA4),
       width_(0),
       height_(0) {
   manager_->StartTracking(this);
 }
 
-bool Renderbuffer::RegenerateAndBindBackingObjectIfNeeded() {
-  if (!allocated_ || !has_been_bound_ || samples_ == 0) {
-    // Not needed - won't trigger bug (multisample_renderbuffer_resize_broken).
-    return false;
-  }
-
-  GLint original_fbo = 0;
-  glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &original_fbo);
-
-  glDeleteRenderbuffersEXT(1, &service_id_);
-  service_id_ = 0;
-  glGenRenderbuffersEXT(1, &service_id_);
-  glBindRenderbufferEXT(GL_RENDERBUFFER, service_id_);
-
-  // Attach new renderbuffer to all framebuffers
-  for (auto& point : framebuffer_attachment_points_) {
-    glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER, point.first->service_id());
-    glFramebufferRenderbufferEXT(GL_DRAW_FRAMEBUFFER, point.second,
-                                 GL_RENDERBUFFER, service_id_);
-  }
-
-  glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER, original_fbo);
-
-  allocated_ = false;
-  return true;
-}
-
 void Renderbuffer::AddFramebufferAttachmentPoint(Framebuffer* framebuffer,
                                                  GLenum attachment) {
   framebuffer_attachment_points_.insert(
       std::make_pair(framebuffer, attachment));
 }
 
 void Renderbuffer::RemoveFramebufferAttachmentPoint(Framebuffer* framebuffer,
                                                     GLenum attachment) {
   framebuffer_attachment_points_.erase(std::make_pair(framebuffer, attachment));
 }
@@ skipping 164 matching lines @@
                                                     client_renderbuffer_id);
     pmd->CreateSharedGlobalAllocatorDump(guid);
     pmd->AddOwnershipEdge(dump->guid(), guid);
   }
 
   return true;
 }
 
 }  // namespace gles2
 }  // namespace gpu