command_buffer: correctly use glGetFramebufferAttachmentParameter

gpu/command_buffer/service/gles2_cmd_decoder.cc

Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index a2fa8a4ce0cc9c61b801b577cec5a758ad9a360d..3b32a73cc89dfa049443a598cb2ea82281091820 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -6067,9 +6067,14 @@ bool GLES2DecoderImpl::GetHelper(
           if (framebuffer->HasAlphaMRT() &&
               framebuffer->HasSameInternalFormatsMRT()) {
             if (feature_info_->gl_version_info().is_desktop_core_profile) {
-              glGetFramebufferAttachmentParameterivEXT(
-                  GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-                  GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE, &v);
+              for (uint32_t i = 0; i < group_->max_draw_buffers(); i++) {
+                if (framebuffer->HasColorAttachment(i)) {
+                  glGetFramebufferAttachmentParameterivEXT(
+                      GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + i,
+                      GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE, &v);
+                  break;
+                }
+              }
             } else {
               glGetIntegerv(GL_ALPHA_BITS, &v);
             }
@@ -6087,10 +6092,12 @@ bool GLES2DecoderImpl::GetHelper(
         if (feature_info_->gl_version_info().is_desktop_core_profile) {
           Framebuffer* framebuffer =
               GetFramebufferInfoForTarget(GL_DRAW_FRAMEBUFFER_EXT);
-          if (framebuffer) {
-            glGetFramebufferAttachmentParameterivEXT(
-                GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
-                GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE, &v);
+          if (framebuffer && framebuffer->HasDepthAttachment()) {

[Zhenyao Mo, 2016/07/05 21:14:16]

Remove it here? Since you moved it inside.

+            if (framebuffer->HasDepthAttachment()) {
+              glGetFramebufferAttachmentParameterivEXT(
+                  GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
+                  GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE, &v);
+            }
           } else {
             v = (back_buffer_has_depth_ ? 24 : 0);
           }
@@ -6110,20 +6117,28 @@ bool GLES2DecoderImpl::GetHelper(
           Framebuffer* framebuffer =
               GetFramebufferInfoForTarget(GL_DRAW_FRAMEBUFFER_EXT);
           if (framebuffer) {
-            GLenum framebuffer_enum = 0;
-            switch (pname) {
-              case GL_RED_BITS:
-                framebuffer_enum = GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE;
-                break;
-              case GL_GREEN_BITS:
-                framebuffer_enum = GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE;
-                break;
-              case GL_BLUE_BITS:
-                framebuffer_enum = GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE;
-                break;
+            if (framebuffer->HasSameInternalFormatsMRT()) {
+              GLenum framebuffer_enum = 0;
+              switch (pname) {
+                case GL_RED_BITS:
+                  framebuffer_enum = GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE;
+                  break;
+                case GL_GREEN_BITS:
+                  framebuffer_enum = GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE;
+                  break;
+                case GL_BLUE_BITS:
+                  framebuffer_enum = GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE;
+                  break;
+              }
+              for (uint32_t i = 0; i < group_->max_draw_buffers(); i++) {
+                if (framebuffer->HasColorAttachment(i)) {
+                  glGetFramebufferAttachmentParameterivEXT(
+                      GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0 + i,
+                      framebuffer_enum, &v);
+                  break;
+                }
+              }
             }
-            glGetFramebufferAttachmentParameterivEXT(
-                GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, framebuffer_enum, &v);
           } else {
             v = 8;
           }
@@ -6141,9 +6156,11 @@ bool GLES2DecoderImpl::GetHelper(
           Framebuffer* framebuffer =
               GetFramebufferInfoForTarget(GL_DRAW_FRAMEBUFFER_EXT);
           if (framebuffer) {
-            glGetFramebufferAttachmentParameterivEXT(
-                GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
-                GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE, &v);
+            if (framebuffer->HasStencilAttachment()) {
+              glGetFramebufferAttachmentParameterivEXT(
+                  GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
+                  GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE, &v);
+            }
           } else {
             v = (back_buffer_has_stencil_ ? 8 : 0);
           }