Move WebGL1 attachment image type / attachment point matching check to command buffer.

gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.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_unittest_base.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 1279 matching lines @@
 void GLES2DecoderTestBase::DoFramebufferRenderbuffer(
     GLenum target,
     GLenum attachment,
     GLenum renderbuffer_target,
     GLuint renderbuffer_client_id,
     GLuint renderbuffer_service_id,
     GLenum error) {
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(GL_NO_ERROR))
       .RetiresOnSaturation();
-  EXPECT_CALL(*gl_, FramebufferRenderbufferEXT(
-      target, attachment, renderbuffer_target, renderbuffer_service_id))
-      .Times(1)
-      .RetiresOnSaturation();
+  if (attachment == GL_DEPTH_STENCIL_ATTACHMENT) {
+    EXPECT_CALL(*gl_, FramebufferRenderbufferEXT(
+        target, GL_DEPTH_ATTACHMENT, renderbuffer_target,
+        renderbuffer_service_id))
+        .Times(1)
+        .RetiresOnSaturation();
+    EXPECT_CALL(*gl_, FramebufferRenderbufferEXT(
+        target, GL_STENCIL_ATTACHMENT, renderbuffer_target,
+        renderbuffer_service_id))
+        .Times(1)
+        .RetiresOnSaturation();
+  } else {
+    EXPECT_CALL(*gl_, FramebufferRenderbufferEXT(
+        target, attachment, renderbuffer_target, renderbuffer_service_id))
+        .Times(1)
+        .RetiresOnSaturation();
+  }
   EXPECT_CALL(*gl_, GetError())
       .WillOnce(Return(error))
       .RetiresOnSaturation();
   cmds::FramebufferRenderbuffer cmd;
   cmd.Init(target, attachment, renderbuffer_target, renderbuffer_client_id);
   EXPECT_EQ(error::kNoError, ExecuteCmd(cmd));
 }
 
 void GLES2DecoderTestBase::DoVertexAttribPointer(
     GLuint index, GLint size, GLenum type, GLsizei stride, GLuint offset) {
@@ skipping 685 matching lines @@
   SetupDefaultProgram();
 }
 
 // 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_unittest_0_autogen.h"
 
 }  // namespace gles2
 }  // namespace gpu