Get ReadPixels to work with INT and UNSIGNED_INT format.

gpu/command_buffer/service/framebuffer_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/framebuffer_manager.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/framebuffer_completeness_cache.h"
 #include "gpu/command_buffer/service/renderbuffer_manager.h"
@@ skipping 341 matching lines @@
   return false;
 }
 
 void Framebuffer::ChangeDrawBuffersHelper(bool recover) const {
   scoped_ptr<GLenum[]> buffers(new GLenum[manager_->max_draw_buffers_]);
   for (uint32 i = 0; i < manager_->max_draw_buffers_; ++i)
     buffers[i] = GL_NONE;
   for (AttachmentMap::const_iterator it = attachments_.begin();
        it != attachments_.end(); ++it) {
     if (it->first >= GL_COLOR_ATTACHMENT0 &&
-        it->first < GL_COLOR_ATTACHMENT0 + manager_->max_draw_buffers_) {
+        it->first < GL_COLOR_ATTACHMENT0 + manager_->max_draw_buffers_ &&
+        !GLES2Util::IsIntegerFormat(it->second->internal_format())) {
       buffers[it->first - GL_COLOR_ATTACHMENT0] = it->first;
     }
   }
   bool different = false;
   for (uint32 i = 0; i < manager_->max_draw_buffers_; ++i) {
     if (buffers[i] != draw_buffers_[i]) {
       different = true;
       break;
     }
   }
   if (different) {
     if (recover)
       glDrawBuffersARB(manager_->max_draw_buffers_, draw_buffers_.get());
     else
       glDrawBuffersARB(manager_->max_draw_buffers_, buffers.get());
   }
 }
 
 void Framebuffer::PrepareDrawBuffersForClear() const {
   bool recover = false;
   ChangeDrawBuffersHelper(recover);
 }
 
 void Framebuffer::RestoreDrawBuffersAfterClear() const {
   bool recover = true;
   ChangeDrawBuffersHelper(recover);
 }
 
+void Framebuffer::ClearIntegerBuffers() {
+  for (AttachmentMap::const_iterator it = attachments_.begin();
+       it != attachments_.end(); ++it) {
+    GLenum internal_format = it->second->internal_format();
+    if (it->first >= GL_COLOR_ATTACHMENT0 &&
+        it->first < GL_COLOR_ATTACHMENT0 + manager_->max_draw_buffers_ &&
+        !it->second->cleared() &&
+        GLES2Util::IsIntegerFormat(internal_format)) {
+      GLint drawbuffer = it->first - GL_COLOR_ATTACHMENT0;
+      if (GLES2Util::IsUnsignedIntegerFormat(internal_format)) {
+        const static GLuint kZero[] = { 0u, 0u, 0u, 0u };
+        glClearBufferuiv(GL_COLOR, drawbuffer, kZero);
+      } else {  // IsUnsignedIntegerFormat(internal_format)
+        const static GLint kZero[] = { 0, 0, 0, 0 };
+        glClearBufferiv(GL_COLOR, drawbuffer, kZero);
+      }
+    }
+  }
+}
+
 void Framebuffer::MarkAttachmentAsCleared(
       RenderbufferManager* renderbuffer_manager,
       TextureManager* texture_manager,
       GLenum attachment,
       bool cleared) {
   AttachmentMap::iterator it = attachments_.find(attachment);
   if (it != attachments_.end()) {
     Attachment* a = it->second.get();
     if (a->cleared() != cleared) {
       a->SetCleared(renderbuffer_manager,
@@ skipping 288 matching lines @@
 const Framebuffer::Attachment* Framebuffer::GetReadBufferAttachment() const {
   if (read_buffer_ == GL_NONE)
     return nullptr;
   return GetAttachment(read_buffer_);
 }
 
 void Framebuffer::OnTextureRefDetached(TextureRef* texture) {
   manager_->OnTextureRefDetached(texture);
 }
 
-void Framebuffer::OnWillRenderTo() const {
+void Framebuffer::OnWillRenderTo(GLenum attachment) const {
   for (AttachmentMap::const_iterator it = attachments_.begin();
        it != attachments_.end(); ++it) {
-    it->second->OnWillRenderTo();
+    if (attachment == 0 || attachment == it->first) {
+      it->second->OnWillRenderTo();
+    }
   }
 }
 
-void Framebuffer::OnDidRenderTo() const {
+void Framebuffer::OnDidRenderTo(GLenum attachment) const {
   for (AttachmentMap::const_iterator it = attachments_.begin();
        it != attachments_.end(); ++it) {
-    it->second->OnDidRenderTo();
+    if (attachment == 0 || attachment == it->first) {
+      it->second->OnDidRenderTo();
+    }
   }
 }
 
 bool FramebufferManager::GetClientId(
     GLuint service_id, GLuint* client_id) const {
   // This doesn't need to be fast. It's only used during slow queries.
   for (FramebufferMap::const_iterator it = framebuffers_.begin();
        it != framebuffers_.end(); ++it) {
     if (it->second->service_id() == service_id) {
       *client_id = it->first;
@@ skipping 32 matching lines @@
            texture_detach_observers_.begin();
        it != texture_detach_observers_.end();
        ++it) {
     TextureDetachObserver* observer = *it;
     observer->OnTextureRefDetachedFromFramebuffer(texture);
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu