Add check if depth and stencil attachments are same image

gpu/command_buffer/service/framebuffer_manager_unittest.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 <stddef.h>
 #include <stdint.h>
 
 #include "gpu/command_buffer/service/error_state_mock.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/framebuffer_manager.h"
@@ skipping 21 matching lines @@
 const GLint kMaxSamples = 4;
 const uint32_t kMaxDrawBuffers = 16;
 const uint32_t kMaxColorAttachments = 16;
 const bool kUseDefaultTextures = false;
 
 }  // namespace
 
 class FramebufferManagerTest : public GpuServiceTest {
  public:
   FramebufferManagerTest()
-      : manager_(1, 1, CONTEXT_TYPE_OPENGLES2, NULL),
+      : manager_(1, 1, CONTEXT_TYPE_OPENGLES2, nullptr),
         feature_info_(new FeatureInfo()) {
-    texture_manager_.reset(new TextureManager(NULL,
+    texture_manager_.reset(new TextureManager(nullptr,
                                               feature_info_.get(),
                                               kMaxTextureSize,
                                               kMaxCubemapSize,
                                               kMaxRectangleTextureSize,
                                               kMax3DTextureSize,
                                               kMaxArrayTextureLayers,
                                               kUseDefaultTextures));
-    renderbuffer_manager_.reset(new RenderbufferManager(NULL,
+    renderbuffer_manager_.reset(new RenderbufferManager(nullptr,
                                                         kMaxRenderbufferSize,
                                                         kMaxSamples,
                                                         feature_info_.get()));
   }
   ~FramebufferManagerTest() override {
     manager_.Destroy(false);
     texture_manager_->Destroy(false);
     renderbuffer_manager_->Destroy(false);
   }
 
  protected:
   FramebufferManager manager_;
   scoped_refptr<FeatureInfo> feature_info_;
   std::unique_ptr<TextureManager> texture_manager_;
   std::unique_ptr<RenderbufferManager> renderbuffer_manager_;
 };
 
 TEST_F(FramebufferManagerTest, Basic) {
   const GLuint kClient1Id = 1;
   const GLuint kService1Id = 11;
   const GLuint kClient2Id = 2;
   // Check we can create framebuffer.
   manager_.CreateFramebuffer(kClient1Id, kService1Id);
   // Check framebuffer got created.
   Framebuffer* framebuffer1 = manager_.GetFramebuffer(kClient1Id);
-  ASSERT_TRUE(framebuffer1 != NULL);
+  ASSERT_TRUE(framebuffer1 != nullptr);
   EXPECT_FALSE(framebuffer1->IsDeleted());
   EXPECT_EQ(kService1Id, framebuffer1->service_id());
   GLuint client_id = 0;
   EXPECT_TRUE(manager_.GetClientId(framebuffer1->service_id(), &client_id));
   EXPECT_EQ(kClient1Id, client_id);
   // Check we get nothing for a non-existent framebuffer.
-  EXPECT_TRUE(manager_.GetFramebuffer(kClient2Id) == NULL);
+  EXPECT_TRUE(manager_.GetFramebuffer(kClient2Id) == nullptr);
   // Check trying to a remove non-existent framebuffers does not crash.
   manager_.RemoveFramebuffer(kClient2Id);
   // Check framebuffer gets deleted when last reference is released.
   EXPECT_CALL(*gl_, DeleteFramebuffersEXT(1, ::testing::Pointee(kService1Id)))
       .Times(1)
       .RetiresOnSaturation();
   // Check we can't get the framebuffer after we remove it.
   manager_.RemoveFramebuffer(kClient1Id);
-  EXPECT_TRUE(manager_.GetFramebuffer(kClient1Id) == NULL);
+  EXPECT_TRUE(manager_.GetFramebuffer(kClient1Id) == nullptr);
 }
 
 TEST_F(FramebufferManagerTest, Destroy) {
   const GLuint kClient1Id = 1;
   const GLuint kService1Id = 11;
   // Check we can create framebuffer.
   manager_.CreateFramebuffer(kClient1Id, kService1Id);
   // Check framebuffer got created.
   Framebuffer* framebuffer1 = manager_.GetFramebuffer(kClient1Id);
-  ASSERT_TRUE(framebuffer1 != NULL);
+  ASSERT_TRUE(framebuffer1 != nullptr);
   EXPECT_CALL(*gl_, DeleteFramebuffersEXT(1, ::testing::Pointee(kService1Id)))
       .Times(1)
       .RetiresOnSaturation();
   manager_.Destroy(true);
   // Check the resources were released.
   framebuffer1 = manager_.GetFramebuffer(kClient1Id);
-  ASSERT_TRUE(framebuffer1 == NULL);
+  ASSERT_TRUE(framebuffer1 == nullptr);
 }
 
 class FramebufferInfoTestBase : public GpuServiceTest {
  public:
   static const GLuint kClient1Id = 1;
   static const GLuint kService1Id = 11;
 
   explicit FramebufferInfoTestBase(ContextType context_type)
       : manager_(kMaxDrawBuffers,
                  kMaxColorAttachments,
                  context_type,
                  new FramebufferCompletenessCache),
         feature_info_(new FeatureInfo()) {
-    texture_manager_.reset(new TextureManager(NULL,
+    texture_manager_.reset(new TextureManager(nullptr,
                                               feature_info_.get(),
                                               kMaxTextureSize,
                                               kMaxCubemapSize,
                                               kMaxRectangleTextureSize,
                                               kMax3DTextureSize,
                                               kMaxArrayTextureLayers,
                                               kUseDefaultTextures));
-    renderbuffer_manager_.reset(new RenderbufferManager(NULL,
+    renderbuffer_manager_.reset(new RenderbufferManager(nullptr,
                                                         kMaxRenderbufferSize,
                                                         kMaxSamples,
                                                         feature_info_.get()));
   }
   ~FramebufferInfoTestBase() override {
     manager_.Destroy(false);
     texture_manager_->Destroy(false);
     renderbuffer_manager_->Destroy(false);
   }
 
  protected:
   void SetUp() override {
     InitializeContext("2.0", "GL_EXT_framebuffer_object");
   }
 
   void InitializeContext(const char* gl_version, const char* extensions) {
     GpuServiceTest::SetUpWithGLVersion(gl_version, extensions);
     TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(gl_.get(),
         extensions, "", gl_version);
     feature_info_->InitializeForTesting();
     decoder_.reset(new MockGLES2Decoder());
     manager_.CreateFramebuffer(kClient1Id, kService1Id);
     error_state_.reset(new ::testing::StrictMock<gles2::MockErrorState>());
     framebuffer_ = manager_.GetFramebuffer(kClient1Id);
-    ASSERT_TRUE(framebuffer_ != NULL);
+    ASSERT_TRUE(framebuffer_ != nullptr);
   }
 
   FramebufferManager manager_;
   Framebuffer* framebuffer_;
   scoped_refptr<FeatureInfo> feature_info_;
   std::unique_ptr<TextureManager> texture_manager_;
   std::unique_ptr<RenderbufferManager> renderbuffer_manager_;
   std::unique_ptr<MockErrorState> error_state_;
   std::unique_ptr<MockGLES2Decoder> decoder_;
 };
 
 class FramebufferInfoTest : public FramebufferInfoTestBase {
  public:
   FramebufferInfoTest() : FramebufferInfoTestBase(CONTEXT_TYPE_OPENGLES2) {}
 };
 
 // GCC requires these declarations, but MSVC requires they not be present
 #ifndef COMPILER_MSVC
 const GLuint FramebufferInfoTestBase::kClient1Id;
 const GLuint FramebufferInfoTestBase::kService1Id;
 #endif
 
 TEST_F(FramebufferInfoTest, Basic) {
   EXPECT_EQ(kService1Id, framebuffer_->service_id());
   EXPECT_FALSE(framebuffer_->IsDeleted());
-  EXPECT_TRUE(NULL == framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0));
-  EXPECT_TRUE(NULL == framebuffer_->GetAttachment(GL_DEPTH_ATTACHMENT));
-  EXPECT_TRUE(NULL == framebuffer_->GetAttachment(GL_STENCIL_ATTACHMENT));
+  EXPECT_TRUE(nullptr == framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0));
+  EXPECT_TRUE(nullptr == framebuffer_->GetAttachment(GL_DEPTH_ATTACHMENT));
+  EXPECT_TRUE(nullptr == framebuffer_->GetAttachment(GL_STENCIL_ATTACHMENT));
   EXPECT_TRUE(
-      NULL == framebuffer_->GetAttachment(GL_DEPTH_STENCIL_ATTACHMENT));
+      nullptr == framebuffer_->GetAttachment(GL_DEPTH_STENCIL_ATTACHMENT));
   EXPECT_FALSE(framebuffer_->HasDepthAttachment());
   EXPECT_FALSE(framebuffer_->HasStencilAttachment());
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT),
             framebuffer_->IsPossiblyComplete(feature_info_.get()));
   EXPECT_TRUE(framebuffer_->IsCleared());
   EXPECT_EQ(static_cast<GLenum>(0),
             framebuffer_->GetReadBufferInternalFormat());
   EXPECT_FALSE(manager_.IsComplete(framebuffer_));
 }
 
 TEST_F(FramebufferInfoTest, AttachRenderbuffer) {
   const GLuint kRenderbufferClient1Id = 33;
   const GLuint kRenderbufferService1Id = 333;
   const GLuint kRenderbufferClient2Id = 34;
   const GLuint kRenderbufferService2Id = 334;
   const GLuint kRenderbufferClient3Id = 35;
   const GLuint kRenderbufferService3Id = 335;
   const GLuint kRenderbufferClient4Id = 36;
   const GLuint kRenderbufferService4Id = 336;
+  const GLuint kRenderbufferClient5Id = 37;
+  const GLuint kRenderbufferService5Id = 337;
   const GLsizei kWidth1 = 16;
   const GLsizei kHeight1 = 32;
   const GLenum kFormat1 = GL_RGBA4;
   const GLenum kBadFormat1 = GL_DEPTH_COMPONENT16;
   const GLsizei kSamples1 = 0;
   const GLsizei kWidth2 = 16;
   const GLsizei kHeight2 = 32;
   const GLenum kFormat2 = GL_DEPTH_COMPONENT16;
   const GLsizei kSamples2 = 0;
   const GLsizei kWidth3 = 16;
   const GLsizei kHeight3 = 32;
   const GLenum kFormat3 = GL_STENCIL_INDEX8;
   const GLsizei kSamples3 = 0;
   const GLsizei kWidth4 = 16;
   const GLsizei kHeight4 = 32;
-  const GLenum kFormat4 = GL_STENCIL_INDEX8;
+  const GLenum kFormat4 = GL_DEPTH24_STENCIL8;
   const GLsizei kSamples4 = 0;
-  const GLsizei kDifferentSamples4 = 1;
+  const GLsizei kWidth5 = 16;
+  const GLsizei kHeight5 = 32;
+  const GLenum kFormat5 = GL_DEPTH24_STENCIL8;
+  const GLsizei kSamples5 = 0;
+  const GLsizei kDifferentSamples5 = 1;
 
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_DEPTH_ATTACHMENT));
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_STENCIL_ATTACHMENT));
   EXPECT_FALSE(
       framebuffer_->HasUnclearedAttachment(GL_DEPTH_STENCIL_ATTACHMENT));
 
   renderbuffer_manager_->CreateRenderbuffer(
       kRenderbufferClient1Id, kRenderbufferService1Id);
   Renderbuffer* renderbuffer1 =
       renderbuffer_manager_->GetRenderbuffer(kRenderbufferClient1Id);
-  ASSERT_TRUE(renderbuffer1 != NULL);
+  ASSERT_TRUE(renderbuffer1 != nullptr);
 
-  // check adding one attachment
+  // Check adding one attachment.
   framebuffer_->AttachRenderbuffer(GL_COLOR_ATTACHMENT0, renderbuffer1);
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_DEPTH_ATTACHMENT));
   EXPECT_EQ(static_cast<GLenum>(GL_RGBA4),
             framebuffer_->GetReadBufferInternalFormat());
   EXPECT_FALSE(framebuffer_->HasDepthAttachment());
   EXPECT_FALSE(framebuffer_->HasStencilAttachment());
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT),
             framebuffer_->IsPossiblyComplete(feature_info_.get()));
   EXPECT_TRUE(framebuffer_->IsCleared());
 
   // Try a format that's not good for COLOR_ATTACHMENT0.
   renderbuffer_manager_->SetInfo(
       renderbuffer1, kSamples1, kBadFormat1, kWidth1, kHeight1);
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT),
             framebuffer_->IsPossiblyComplete(feature_info_.get()));
 
   // Try a good format.
   renderbuffer_manager_->SetInfo(
       renderbuffer1, kSamples1, kFormat1, kWidth1, kHeight1);
   EXPECT_EQ(static_cast<GLenum>(kFormat1),
             framebuffer_->GetReadBufferInternalFormat());
   EXPECT_FALSE(framebuffer_->HasDepthAttachment());
   EXPECT_FALSE(framebuffer_->HasStencilAttachment());
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             framebuffer_->IsPossiblyComplete(feature_info_.get()));
   EXPECT_FALSE(framebuffer_->IsCleared());
 
-  // check adding another
+  // Check adding another.
   renderbuffer_manager_->CreateRenderbuffer(
       kRenderbufferClient2Id, kRenderbufferService2Id);
   Renderbuffer* renderbuffer2 =
       renderbuffer_manager_->GetRenderbuffer(kRenderbufferClient2Id);
-  ASSERT_TRUE(renderbuffer2 != NULL);
+  ASSERT_TRUE(renderbuffer2 != nullptr);
   framebuffer_->AttachRenderbuffer(GL_DEPTH_ATTACHMENT, renderbuffer2);
   EXPECT_TRUE(framebuffer_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_DEPTH_ATTACHMENT));
   EXPECT_EQ(static_cast<GLenum>(kFormat1),
             framebuffer_->GetReadBufferInternalFormat());
   EXPECT_TRUE(framebuffer_->HasDepthAttachment());
   EXPECT_FALSE(framebuffer_->HasStencilAttachment());
   // The attachment has a size of 0,0 so depending on the order of the map
   // of attachments it could either get INCOMPLETE_ATTACHMENT because it's 0,0
   // or INCOMPLETE_DIMENSIONS because it's not the same size as the other
   // attachment.
   GLenum status = framebuffer_->IsPossiblyComplete(feature_info_.get());
   EXPECT_TRUE(
       status == GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT ||
       status == GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT);
   EXPECT_FALSE(framebuffer_->IsCleared());
 
   renderbuffer_manager_->SetInfo(
       renderbuffer2, kSamples2, kFormat2, kWidth2, kHeight2);
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             framebuffer_->IsPossiblyComplete(feature_info_.get()));
   EXPECT_FALSE(framebuffer_->IsCleared());
   EXPECT_TRUE(framebuffer_->HasUnclearedAttachment(GL_DEPTH_ATTACHMENT));
 
-  // check marking them as cleared.
+  // Check marking them as cleared.
   manager_.MarkAttachmentsAsCleared(
       framebuffer_, renderbuffer_manager_.get(), texture_manager_.get());
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_DEPTH_ATTACHMENT));
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             framebuffer_->IsPossiblyComplete(feature_info_.get()));
   EXPECT_TRUE(framebuffer_->IsCleared());
 
-  // Check adding one that is already cleared.
+  // Add another one to stencil attachment point.
   renderbuffer_manager_->CreateRenderbuffer(
       kRenderbufferClient3Id, kRenderbufferService3Id);
   Renderbuffer* renderbuffer3 =
       renderbuffer_manager_->GetRenderbuffer(kRenderbufferClient3Id);
-  ASSERT_TRUE(renderbuffer3 != NULL);
+  ASSERT_TRUE(renderbuffer3 != nullptr);
   renderbuffer_manager_->SetInfo(
       renderbuffer3, kSamples3, kFormat3, kWidth3, kHeight3);
   renderbuffer_manager_->SetCleared(renderbuffer3, true);
 
   framebuffer_->AttachRenderbuffer(GL_STENCIL_ATTACHMENT, renderbuffer3);
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_STENCIL_ATTACHMENT));
   EXPECT_EQ(static_cast<GLenum>(kFormat1),
             framebuffer_->GetReadBufferInternalFormat());
   EXPECT_TRUE(framebuffer_->HasDepthAttachment());
   EXPECT_TRUE(framebuffer_->HasStencilAttachment());
+  // Binding different images to depth and stencil attachment points should
+  // return FRAMEBUFFER_UNSUPPORTED.
+  EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_UNSUPPORTED),
+            framebuffer_->IsPossiblyComplete(feature_info_.get()));
+
+  // Bind a renderbufer in format DEPTH_STENCIL to depth and stencil
+  // attachment points.
+  renderbuffer_manager_->CreateRenderbuffer(
+      kRenderbufferClient4Id, kRenderbufferService4Id);
+  Renderbuffer* renderbuffer4 =
+      renderbuffer_manager_->GetRenderbuffer(kRenderbufferClient4Id);
+  ASSERT_TRUE(renderbuffer4 != nullptr);
+  renderbuffer_manager_->SetInfo(
+      renderbuffer4, kSamples4, kFormat4, kWidth4, kHeight4);
+  renderbuffer_manager_->SetCleared(renderbuffer4, true);
+
+  EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_DEPTH_ATTACHMENT));
+  EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_STENCIL_ATTACHMENT));
+  framebuffer_->AttachRenderbuffer(GL_DEPTH_ATTACHMENT, renderbuffer4);
+  framebuffer_->AttachRenderbuffer(GL_STENCIL_ATTACHMENT, renderbuffer4);
+  EXPECT_EQ(static_cast<GLenum>(kFormat1),
+            framebuffer_->GetReadBufferInternalFormat());
+  EXPECT_TRUE(framebuffer_->HasDepthAttachment());
+  EXPECT_TRUE(framebuffer_->HasStencilAttachment());
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             framebuffer_->IsPossiblyComplete(feature_info_.get()));
   EXPECT_TRUE(framebuffer_->IsCleared());
 
-  // Check marking the renderbuffer as unclared.
+  // Check marking the renderbuffer as uncleared.
   renderbuffer_manager_->SetInfo(
       renderbuffer1, kSamples1, kFormat1, kWidth1, kHeight1);
   EXPECT_EQ(static_cast<GLenum>(kFormat1),
             framebuffer_->GetReadBufferInternalFormat());
   EXPECT_TRUE(framebuffer_->HasDepthAttachment());
   EXPECT_TRUE(framebuffer_->HasStencilAttachment());
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             framebuffer_->IsPossiblyComplete(feature_info_.get()));
   EXPECT_FALSE(framebuffer_->IsCleared());
 
   const Framebuffer::Attachment* attachment =
       framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0);
-  ASSERT_TRUE(attachment != NULL);
+  ASSERT_TRUE(attachment != nullptr);
   EXPECT_EQ(kWidth1, attachment->width());
   EXPECT_EQ(kHeight1, attachment->height());
   EXPECT_EQ(kSamples1, attachment->samples());
   EXPECT_EQ(kFormat1, attachment->internal_format());
   EXPECT_FALSE(attachment->cleared());
 
   EXPECT_TRUE(framebuffer_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
 
   // Clear it.
   manager_.MarkAttachmentsAsCleared(
       framebuffer_, renderbuffer_manager_.get(), texture_manager_.get());
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_TRUE(framebuffer_->IsCleared());
 
-  // Check replacing an attachment
+  // Check replacing one attachment when both depth and stencil attachments
+  // are present.
   renderbuffer_manager_->CreateRenderbuffer(
-      kRenderbufferClient4Id, kRenderbufferService4Id);
-  Renderbuffer* renderbuffer4 =
-      renderbuffer_manager_->GetRenderbuffer(kRenderbufferClient4Id);
-  ASSERT_TRUE(renderbuffer4 != NULL);
+      kRenderbufferClient5Id, kRenderbufferService5Id);
+  Renderbuffer* renderbuffer5 =
+      renderbuffer_manager_->GetRenderbuffer(kRenderbufferClient5Id);
+  ASSERT_TRUE(renderbuffer5 != nullptr);
   renderbuffer_manager_->SetInfo(
-      renderbuffer4, kSamples4, kFormat4, kWidth4, kHeight4);
+      renderbuffer5, kSamples5, kFormat5, kWidth5, kHeight5);
 
-  framebuffer_->AttachRenderbuffer(GL_STENCIL_ATTACHMENT, renderbuffer4);
+  framebuffer_->AttachRenderbuffer(GL_STENCIL_ATTACHMENT, renderbuffer5);
   EXPECT_TRUE(framebuffer_->HasUnclearedAttachment(GL_STENCIL_ATTACHMENT));
   EXPECT_FALSE(framebuffer_->IsCleared());
 
   attachment = framebuffer_->GetAttachment(GL_STENCIL_ATTACHMENT);
-  ASSERT_TRUE(attachment != NULL);
-  EXPECT_EQ(kWidth4, attachment->width());
-  EXPECT_EQ(kHeight4, attachment->height());
-  EXPECT_EQ(kSamples4, attachment->samples());
-  EXPECT_EQ(kFormat4, attachment->internal_format());
+  ASSERT_TRUE(attachment != nullptr);
+  EXPECT_EQ(kWidth5, attachment->width());
+  EXPECT_EQ(kHeight5, attachment->height());
+  EXPECT_EQ(kSamples5, attachment->samples());
+  EXPECT_EQ(kFormat5, attachment->internal_format());
+  EXPECT_FALSE(attachment->cleared());
+  // Binding different images to depth and stencil attachment points should
+  // return FRAMEBUFFER_UNSUPPORTED.
+  EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_UNSUPPORTED),
+            framebuffer_->IsPossiblyComplete(feature_info_.get()));
+
+  // Check replacing both depth and stencil attachments.
+  framebuffer_->AttachRenderbuffer(GL_DEPTH_ATTACHMENT, renderbuffer5);
+  EXPECT_TRUE(framebuffer_->HasUnclearedAttachment(GL_DEPTH_ATTACHMENT));
+  EXPECT_TRUE(framebuffer_->HasUnclearedAttachment(GL_STENCIL_ATTACHMENT));
+  EXPECT_FALSE(framebuffer_->IsCleared());
+
+  attachment = framebuffer_->GetAttachment(GL_DEPTH_ATTACHMENT);
+  EXPECT_EQ(kWidth5, attachment->width());
+  EXPECT_EQ(kHeight5, attachment->height());
+  EXPECT_EQ(kSamples5, attachment->samples());
+  EXPECT_EQ(kFormat5, attachment->internal_format());
   EXPECT_FALSE(attachment->cleared());
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             framebuffer_->IsPossiblyComplete(feature_info_.get()));
 
   // Change samples.
   ASSERT_FALSE(
       feature_info_->feature_flags().chromium_framebuffer_mixed_samples);
   renderbuffer_manager_->SetInfo(
-      renderbuffer4, kDifferentSamples4, kFormat4, kWidth4, kHeight4);
+      renderbuffer5, kDifferentSamples5, kFormat5, kWidth5, kHeight5);
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE),
             framebuffer_->IsPossiblyComplete(feature_info_.get()));
   renderbuffer_manager_->SetInfo(
-      renderbuffer4, kSamples4, kFormat4, kWidth4, kHeight4);
+      renderbuffer5, kSamples5, kFormat5, kWidth5, kHeight5);
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             framebuffer_->IsPossiblyComplete(feature_info_.get()));
 
   // Check changing an attachment.
   renderbuffer_manager_->SetInfo(
-      renderbuffer4, kSamples4, kFormat4, kWidth4 + 1, kHeight4);
+      renderbuffer5, kSamples5, kFormat5, kWidth5 + 1, kHeight5);
 
   attachment = framebuffer_->GetAttachment(GL_STENCIL_ATTACHMENT);
-  ASSERT_TRUE(attachment != NULL);
-  EXPECT_EQ(kWidth4 + 1, attachment->width());
-  EXPECT_EQ(kHeight4, attachment->height());
-  EXPECT_EQ(kSamples4, attachment->samples());
-  EXPECT_EQ(kFormat4, attachment->internal_format());
+  ASSERT_TRUE(attachment != nullptr);
+  EXPECT_EQ(kWidth5 + 1, attachment->width());
+  EXPECT_EQ(kHeight5, attachment->height());
+  EXPECT_EQ(kSamples5, attachment->samples());
+  EXPECT_EQ(kFormat5, attachment->internal_format());
   EXPECT_FALSE(attachment->cleared());
   EXPECT_FALSE(framebuffer_->IsCleared());
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT),
             framebuffer_->IsPossiblyComplete(feature_info_.get()));
 
   // Check removing it.
-  framebuffer_->AttachRenderbuffer(GL_STENCIL_ATTACHMENT, NULL);
+  // Restore the width of renderbuffer5 to avoid INCOMPLETE_DIMENSIONS_EXT.
+  renderbuffer_manager_->SetInfo(
+      renderbuffer5, kSamples5, kFormat5, kWidth5, kHeight5);
+
+  framebuffer_->AttachRenderbuffer(GL_STENCIL_ATTACHMENT, nullptr);
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_STENCIL_ATTACHMENT));
   EXPECT_EQ(static_cast<GLenum>(kFormat1),
             framebuffer_->GetReadBufferInternalFormat());
   EXPECT_TRUE(framebuffer_->HasDepthAttachment());
   EXPECT_FALSE(framebuffer_->HasStencilAttachment());
-
-  EXPECT_TRUE(framebuffer_->IsCleared());
+  EXPECT_FALSE(framebuffer_->IsCleared());
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             framebuffer_->IsPossiblyComplete(feature_info_.get()));
 
   // Remove depth, Set color to 0 size.
-  framebuffer_->AttachRenderbuffer(GL_DEPTH_ATTACHMENT, NULL);
+  framebuffer_->AttachRenderbuffer(GL_DEPTH_ATTACHMENT, nullptr);
   renderbuffer_manager_->SetInfo(renderbuffer1, kSamples1, kFormat1, 0, 0);
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT),
             framebuffer_->IsPossiblyComplete(feature_info_.get()));
 
   // Remove color.
-  framebuffer_->AttachRenderbuffer(GL_COLOR_ATTACHMENT0, NULL);
+  framebuffer_->AttachRenderbuffer(GL_COLOR_ATTACHMENT0, nullptr);
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT),
             framebuffer_->IsPossiblyComplete(feature_info_.get()));
 }
 
 TEST_F(FramebufferInfoTest, AttachTexture2D) {
   const GLuint kTextureClient1Id = 33;
   const GLuint kTextureService1Id = 333;
   const GLuint kTextureClient2Id = 34;
   const GLuint kTextureService2Id = 334;
   const GLint kDepth = 1;
@@ skipping 21 matching lines @@
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_DEPTH_ATTACHMENT));
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_STENCIL_ATTACHMENT));
   EXPECT_FALSE(
       framebuffer_->HasUnclearedAttachment(GL_DEPTH_STENCIL_ATTACHMENT));
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT),
             framebuffer_->IsPossiblyComplete(feature_info_.get()));
 
   texture_manager_->CreateTexture(kTextureClient1Id, kTextureService1Id);
   scoped_refptr<TextureRef> texture1(
       texture_manager_->GetTexture(kTextureClient1Id));
-  ASSERT_TRUE(texture1.get() != NULL);
+  ASSERT_TRUE(texture1.get() != nullptr);
 
   // check adding one attachment
   framebuffer_->AttachTexture(
       GL_COLOR_ATTACHMENT0, texture1.get(), kTarget1, kLevel1, kSamples1);
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT),
             framebuffer_->IsPossiblyComplete(feature_info_.get()));
   EXPECT_TRUE(framebuffer_->IsCleared());
   EXPECT_EQ(static_cast<GLenum>(0),
             framebuffer_->GetReadBufferInternalFormat());
@@ skipping 17 matching lines @@
                                  kFormat1, kWidth1, kHeight1, kDepth, kBorder,
                                  kFormat1, kType, gfx::Rect(kWidth1, kHeight1));
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             framebuffer_->IsPossiblyComplete(feature_info_.get()));
   EXPECT_TRUE(framebuffer_->IsCleared());
   EXPECT_EQ(static_cast<GLenum>(kFormat1),
             framebuffer_->GetReadBufferInternalFormat());
 
   const Framebuffer::Attachment* attachment =
       framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0);
-  ASSERT_TRUE(attachment != NULL);
+  ASSERT_TRUE(attachment != nullptr);
   EXPECT_EQ(kWidth1, attachment->width());
   EXPECT_EQ(kHeight1, attachment->height());
   EXPECT_EQ(kSamples1, attachment->samples());
   EXPECT_EQ(kFormat1, attachment->internal_format());
   EXPECT_TRUE(attachment->cleared());
 
   // Check replacing an attachment
   texture_manager_->CreateTexture(kTextureClient2Id, kTextureService2Id);
   scoped_refptr<TextureRef> texture2(
       texture_manager_->GetTexture(kTextureClient2Id));
-  ASSERT_TRUE(texture2.get() != NULL);
+  ASSERT_TRUE(texture2.get() != nullptr);
   texture_manager_->SetTarget(texture2.get(), GL_TEXTURE_2D);
   texture_manager_->SetLevelInfo(texture2.get(), GL_TEXTURE_2D, kLevel2,
                                  kFormat2, kWidth2, kHeight2, kDepth, kBorder,
                                  kFormat2, kType, gfx::Rect(kWidth2, kHeight2));
 
   framebuffer_->AttachTexture(
       GL_COLOR_ATTACHMENT0, texture2.get(), kTarget2, kLevel2, kSamples2);
   EXPECT_EQ(static_cast<GLenum>(kFormat2),
             framebuffer_->GetReadBufferInternalFormat());
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             framebuffer_->IsPossiblyComplete(feature_info_.get()));
   EXPECT_TRUE(framebuffer_->IsCleared());
 
   attachment = framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0);
-  ASSERT_TRUE(attachment != NULL);
+  ASSERT_TRUE(attachment != nullptr);
   EXPECT_EQ(kWidth2, attachment->width());
   EXPECT_EQ(kHeight2, attachment->height());
   EXPECT_EQ(kSamples2, attachment->samples());
   EXPECT_EQ(kFormat2, attachment->internal_format());
   EXPECT_TRUE(attachment->cleared());
 
   // Check changing attachment
   texture_manager_->SetLevelInfo(texture2.get(), GL_TEXTURE_2D, kLevel3,
                                  kFormat3, kWidth3, kHeight3, kDepth, kBorder,
                                  kFormat3, kType, gfx::Rect());
   attachment = framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0);
-  ASSERT_TRUE(attachment != NULL);
+  ASSERT_TRUE(attachment != nullptr);
   EXPECT_EQ(kWidth3, attachment->width());
   EXPECT_EQ(kHeight3, attachment->height());
   EXPECT_EQ(kSamples3, attachment->samples());
   EXPECT_EQ(kFormat3, attachment->internal_format());
   EXPECT_FALSE(attachment->cleared());
   EXPECT_EQ(static_cast<GLenum>(kFormat3),
             framebuffer_->GetReadBufferInternalFormat());
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             framebuffer_->IsPossiblyComplete(feature_info_.get()));
   EXPECT_FALSE(framebuffer_->IsCleared());
 
   // Set to size 0
   texture_manager_->SetLevelInfo(texture2.get(), GL_TEXTURE_2D, kLevel3,
                                  kFormat3, 0, 0, kDepth, kBorder, kFormat3,
                                  kType, gfx::Rect());
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT),
             framebuffer_->IsPossiblyComplete(feature_info_.get()));
 
   // Check removing it.
-  framebuffer_->AttachTexture(GL_COLOR_ATTACHMENT0, NULL, 0, 0, 0);
-  EXPECT_TRUE(framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0) == NULL);
+  framebuffer_->AttachTexture(GL_COLOR_ATTACHMENT0, nullptr, 0, 0, 0);
+  EXPECT_TRUE(framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0) == nullptr);
   EXPECT_EQ(static_cast<GLenum>(0),
             framebuffer_->GetReadBufferInternalFormat());
 
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT),
             framebuffer_->IsPossiblyComplete(feature_info_.get()));
   EXPECT_TRUE(framebuffer_->IsCleared());
 }
 
 TEST_F(FramebufferInfoTest, AttachTextureCube) {
   const GLuint kTextureClientId = 33;
@@ skipping 109 matching lines @@
   EXPECT_EQ(kFormat, attachment->internal_format());
   EXPECT_FALSE(attachment->cleared());
 }
 
 TEST_F(FramebufferInfoTest, ClearPartiallyClearedAttachments) {
   const GLuint kTextureClientId = 33;
   const GLuint kTextureServiceId = 333;
   texture_manager_->CreateTexture(kTextureClientId, kTextureServiceId);
   scoped_refptr<TextureRef> texture(
       texture_manager_->GetTexture(kTextureClientId));
-  ASSERT_TRUE(texture.get() != NULL);
+  ASSERT_TRUE(texture.get() != nullptr);
   texture_manager_->SetTarget(texture.get(), GL_TEXTURE_2D);
   framebuffer_->AttachTexture(
       GL_COLOR_ATTACHMENT0, texture.get(), GL_TEXTURE_2D, 0, 0);
   const Framebuffer::Attachment* attachment =
       framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0);
-  ASSERT_TRUE(attachment != NULL);
+  ASSERT_TRUE(attachment != nullptr);
 
   // Not cleared at all.
   texture_manager_->SetLevelInfo(texture.get(), GL_TEXTURE_2D, 0, GL_RGBA, 4,
                                  4, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE,
                                  gfx::Rect());
   EXPECT_FALSE(attachment->cleared());
   EXPECT_FALSE(attachment->IsPartiallyCleared());
   EXPECT_FALSE(framebuffer_->IsCleared());
   EXPECT_TRUE(framebuffer_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_TRUE(framebuffer_->HasUnclearedColorAttachments());
@@ skipping 57 matching lines @@
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_FALSE(framebuffer_->HasUnclearedColorAttachments());
 }
 
 TEST_F(FramebufferInfoTest, Clear3DTextureAttachments) {
   const GLuint kTextureClientId = 33;
   const GLuint kTextureServiceId = 333;
   texture_manager_->CreateTexture(kTextureClientId, kTextureServiceId);
   scoped_refptr<TextureRef> texture(
       texture_manager_->GetTexture(kTextureClientId));
-  ASSERT_TRUE(texture.get() != NULL);
+  ASSERT_TRUE(texture.get() != nullptr);
   texture_manager_->SetTarget(texture.get(), GL_TEXTURE_3D);
   framebuffer_->AttachTexture(
       GL_COLOR_ATTACHMENT0, texture.get(), GL_TEXTURE_3D, 0, 0);
   const Framebuffer::Attachment* attachment =
       framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0);
-  ASSERT_TRUE(attachment != NULL);
+  ASSERT_TRUE(attachment != nullptr);
 
   const int kWidth = 4;
   const int kHeight = 8;
   const int kDepth = 2;
 
   // Fully cleared.
   texture_manager_->SetLevelInfo(texture.get(), GL_TEXTURE_2D, 0, GL_RGBA8,
                                  kWidth, kHeight, kDepth,
                                  0, GL_RGBA, GL_UNSIGNED_BYTE,
                                  gfx::Rect(0, 0, kWidth, kHeight));
@@ skipping 38 matching lines @@
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_FALSE(framebuffer_->HasUnclearedColorAttachments());
 }
 
 TEST_F(FramebufferInfoTest, Clear3DOutsideRenderableRange) {
   const GLuint kTextureClientId = 33;
   const GLuint kTextureServiceId = 333;
   texture_manager_->CreateTexture(kTextureClientId, kTextureServiceId);
   scoped_refptr<TextureRef> texture(
       texture_manager_->GetTexture(kTextureClientId));
-  ASSERT_TRUE(texture.get() != NULL);
+  ASSERT_TRUE(texture.get() != nullptr);
   texture_manager_->SetTarget(texture.get(), GL_TEXTURE_3D);
   // Set base level to 1 but attach level 0.
   TestHelper::SetTexParameteriWithExpectations(gl_.get(),
                                                error_state_.get(),
                                                texture_manager_.get(),
                                                texture.get(),
                                                GL_TEXTURE_BASE_LEVEL,
                                                1,
                                                GL_NO_ERROR);
   framebuffer_->AttachTexture(
       GL_COLOR_ATTACHMENT0, texture.get(), GL_TEXTURE_3D, 0, 0);
   const Framebuffer::Attachment* attachment =
       framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0);
-  ASSERT_TRUE(attachment != NULL);
+  ASSERT_TRUE(attachment != nullptr);
 
   // Level 0 is not cleared at all.
   texture_manager_->SetLevelInfo(texture.get(), GL_TEXTURE_3D, 0, GL_RGBA, 4,
                                  4, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE,
                                  gfx::Rect());
   // Level 1 is cleared.
   texture_manager_->SetLevelInfo(texture.get(), GL_TEXTURE_3D, 1, GL_RGBA, 2,
                                  2, 1, 0, GL_RGBA, GL_UNSIGNED_BYTE,
                                  gfx::Rect(0, 0, 2, 2));
   EXPECT_FALSE(attachment->cleared());
@@ skipping 14 matching lines @@
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_FALSE(framebuffer_->HasUnclearedColorAttachments());
 }
 
 TEST_F(FramebufferInfoTest, ClearIntegerTextureAttachments) {
   const GLuint kTextureClientId = 33;
   const GLuint kTextureServiceId = 333;
   texture_manager_->CreateTexture(kTextureClientId, kTextureServiceId);
   scoped_refptr<TextureRef> texture(
       texture_manager_->GetTexture(kTextureClientId));
-  ASSERT_TRUE(texture.get() != NULL);
+  ASSERT_TRUE(texture.get() != nullptr);
   texture_manager_->SetTarget(texture.get(), GL_TEXTURE_2D);
   framebuffer_->AttachTexture(
       GL_COLOR_ATTACHMENT0, texture.get(), GL_TEXTURE_2D, 0, 0);
   const Framebuffer::Attachment* attachment =
       framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0);
-  ASSERT_TRUE(attachment != NULL);
+  ASSERT_TRUE(attachment != nullptr);
 
   const int kWidth = 4;
   const int kHeight = 8;
 
   // Fully cleared.
   texture_manager_->SetLevelInfo(texture.get(), GL_TEXTURE_2D, 0, GL_RGBA8UI,
                                  kWidth, kHeight, 1,
                                  0, GL_RGBA_INTEGER, GL_UNSIGNED_BYTE,
                                  gfx::Rect(0, 0, kWidth, kHeight));
   EXPECT_TRUE(attachment->cleared());
@@ skipping 40 matching lines @@
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_FALSE(framebuffer_->HasUnclearedColorAttachments());
 }
 
 TEST_F(FramebufferInfoTest, ClearIntegerOutsideRenderableRange) {
   const GLuint kTextureClientId = 33;
   const GLuint kTextureServiceId = 333;
   texture_manager_->CreateTexture(kTextureClientId, kTextureServiceId);
   scoped_refptr<TextureRef> texture(
       texture_manager_->GetTexture(kTextureClientId));
-  ASSERT_TRUE(texture.get() != NULL);
+  ASSERT_TRUE(texture.get() != nullptr);
   texture_manager_->SetTarget(texture.get(), GL_TEXTURE_2D);
   // Set base level to 1 but attach level 0.
   TestHelper::SetTexParameteriWithExpectations(gl_.get(),
                                                error_state_.get(),
                                                texture_manager_.get(),
                                                texture.get(),
                                                GL_TEXTURE_BASE_LEVEL,
                                                1,
                                                GL_NO_ERROR);
   framebuffer_->AttachTexture(
       GL_COLOR_ATTACHMENT0, texture.get(), GL_TEXTURE_2D, 0, 0);
   const Framebuffer::Attachment* attachment =
       framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0);
-  ASSERT_TRUE(attachment != NULL);
+  ASSERT_TRUE(attachment != nullptr);
 
   // Level 0 is not cleared at all.
   texture_manager_->SetLevelInfo(texture.get(), GL_TEXTURE_2D, 0, GL_RGBA8UI, 4,
                                  4, 1, 0, GL_RGBA_INTEGER, GL_UNSIGNED_BYTE,
                                  gfx::Rect());
   // Level 1 is cleared.
   texture_manager_->SetLevelInfo(texture.get(), GL_TEXTURE_2D, 1, GL_RGBA8UI, 2,
                                  2, 1, 0, GL_RGBA_INTEGER, GL_UNSIGNED_BYTE,
                                  gfx::Rect(0, 0, 2, 2));
   EXPECT_FALSE(attachment->cleared());
@@ skipping 274 matching lines @@
   const GLenum kInternalFormat = GL_RGBA32F;
   const GLenum kTarget = GL_TEXTURE_2D;
   const GLsizei kSamples = 0;
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_DEPTH_ATTACHMENT));
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_STENCIL_ATTACHMENT));
 
   texture_manager_->CreateTexture(kTextureClientId, kTextureServiceId);
   scoped_refptr<TextureRef> texture(
       texture_manager_->GetTexture(kTextureClientId));
-  ASSERT_TRUE(texture.get() != NULL);
+  ASSERT_TRUE(texture.get() != nullptr);
 
   framebuffer_->AttachTexture(
       GL_COLOR_ATTACHMENT0, texture.get(), kTarget, kLevel, kSamples);
   EXPECT_EQ(static_cast<GLenum>(0),
             framebuffer_->GetReadBufferInternalFormat());
 
   texture_manager_->SetTarget(texture.get(), GL_TEXTURE_2D);
   texture_manager_->SetLevelInfo(texture.get(), GL_TEXTURE_2D, kLevel,
                                  kInternalFormat, kWidth, kHeight, kDepth,
                                  kBorder, kFormat, kType, gfx::Rect());
   // Texture with a sized float internalformat is allowed as an attachment
   // since float color attachment extension is present.
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
             framebuffer_->IsPossiblyComplete(feature_info_.get()));
 }
 
 TEST_F(FramebufferInfoTest, UnbindRenderbuffer) {
   const GLuint kRenderbufferClient1Id = 33;
   const GLuint kRenderbufferService1Id = 333;
   const GLuint kRenderbufferClient2Id = 34;
   const GLuint kRenderbufferService2Id = 334;
 
   renderbuffer_manager_->CreateRenderbuffer(
       kRenderbufferClient1Id, kRenderbufferService1Id);
   Renderbuffer* renderbuffer1 =
       renderbuffer_manager_->GetRenderbuffer(kRenderbufferClient1Id);
-  ASSERT_TRUE(renderbuffer1 != NULL);
+  ASSERT_TRUE(renderbuffer1 != nullptr);
   renderbuffer_manager_->CreateRenderbuffer(
       kRenderbufferClient2Id, kRenderbufferService2Id);
   Renderbuffer* renderbuffer2 =
       renderbuffer_manager_->GetRenderbuffer(kRenderbufferClient2Id);
-  ASSERT_TRUE(renderbuffer2 != NULL);
+  ASSERT_TRUE(renderbuffer2 != nullptr);
 
   // Attach to 2 attachment points.
   framebuffer_->AttachRenderbuffer(GL_COLOR_ATTACHMENT0, renderbuffer1);
   framebuffer_->AttachRenderbuffer(GL_DEPTH_ATTACHMENT, renderbuffer1);
   // Check they were attached.
-  EXPECT_TRUE(framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0) != NULL);
-  EXPECT_TRUE(framebuffer_->GetAttachment(GL_DEPTH_ATTACHMENT) != NULL);
+  EXPECT_TRUE(framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0) != nullptr);
+  EXPECT_TRUE(framebuffer_->GetAttachment(GL_DEPTH_ATTACHMENT) != nullptr);
   // Unbind unattached renderbuffer.
   framebuffer_->UnbindRenderbuffer(GL_RENDERBUFFER, renderbuffer2);
   // Should be no-op.
-  EXPECT_TRUE(framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0) != NULL);
-  EXPECT_TRUE(framebuffer_->GetAttachment(GL_DEPTH_ATTACHMENT) != NULL);
+  EXPECT_TRUE(framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0) != nullptr);
+  EXPECT_TRUE(framebuffer_->GetAttachment(GL_DEPTH_ATTACHMENT) != nullptr);
   // Unbind renderbuffer.
   framebuffer_->UnbindRenderbuffer(GL_RENDERBUFFER, renderbuffer1);
   // Check they were detached
-  EXPECT_TRUE(framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0) == NULL);
-  EXPECT_TRUE(framebuffer_->GetAttachment(GL_DEPTH_ATTACHMENT) == NULL);
+  EXPECT_TRUE(framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0) == nullptr);
+  EXPECT_TRUE(framebuffer_->GetAttachment(GL_DEPTH_ATTACHMENT) == nullptr);
 }
 
 TEST_F(FramebufferInfoTest, UnbindTexture) {
   const GLuint kTextureClient1Id = 33;
   const GLuint kTextureService1Id = 333;
   const GLuint kTextureClient2Id = 34;
   const GLuint kTextureService2Id = 334;
   const GLenum kTarget1 = GL_TEXTURE_2D;
   const GLint kLevel1 = 0;
   const GLint kSamples1 = 0;
 
   texture_manager_->CreateTexture(kTextureClient1Id, kTextureService1Id);
   scoped_refptr<TextureRef> texture1(
       texture_manager_->GetTexture(kTextureClient1Id));
-  ASSERT_TRUE(texture1.get() != NULL);
+  ASSERT_TRUE(texture1.get() != nullptr);
   texture_manager_->CreateTexture(kTextureClient2Id, kTextureService2Id);
   scoped_refptr<TextureRef> texture2(
       texture_manager_->GetTexture(kTextureClient2Id));
-  ASSERT_TRUE(texture2.get() != NULL);
+  ASSERT_TRUE(texture2.get() != nullptr);
 
   // Attach to 2 attachment points.
   framebuffer_->AttachTexture(
       GL_COLOR_ATTACHMENT0, texture1.get(), kTarget1, kLevel1, kSamples1);
   framebuffer_->AttachTexture(
       GL_DEPTH_ATTACHMENT, texture1.get(), kTarget1, kLevel1, kSamples1);
   // Check they were attached.
-  EXPECT_TRUE(framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0) != NULL);
-  EXPECT_TRUE(framebuffer_->GetAttachment(GL_DEPTH_ATTACHMENT) != NULL);
+  EXPECT_TRUE(framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0) != nullptr);
+  EXPECT_TRUE(framebuffer_->GetAttachment(GL_DEPTH_ATTACHMENT) != nullptr);
   // Unbind unattached texture.
   framebuffer_->UnbindTexture(kTarget1, texture2.get());
   // Should be no-op.
-  EXPECT_TRUE(framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0) != NULL);
-  EXPECT_TRUE(framebuffer_->GetAttachment(GL_DEPTH_ATTACHMENT) != NULL);
+  EXPECT_TRUE(framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0) != nullptr);
+  EXPECT_TRUE(framebuffer_->GetAttachment(GL_DEPTH_ATTACHMENT) != nullptr);
   // Unbind texture.
   framebuffer_->UnbindTexture(kTarget1, texture1.get());
   // Check they were detached
-  EXPECT_TRUE(framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0) == NULL);
-  EXPECT_TRUE(framebuffer_->GetAttachment(GL_DEPTH_ATTACHMENT) == NULL);
+  EXPECT_TRUE(framebuffer_->GetAttachment(GL_COLOR_ATTACHMENT0) == nullptr);
+  EXPECT_TRUE(framebuffer_->GetAttachment(GL_DEPTH_ATTACHMENT) == nullptr);
 }
 
 TEST_F(FramebufferInfoTest, IsCompleteMarkAsComplete) {
   const GLuint kRenderbufferClient1Id = 33;
   const GLuint kRenderbufferService1Id = 333;
   const GLuint kTextureClient2Id = 34;
   const GLuint kTextureService2Id = 334;
   const GLenum kTarget1 = GL_TEXTURE_2D;
   const GLint kLevel1 = 0;
   const GLint kSamples1 = 0;
 
   renderbuffer_manager_->CreateRenderbuffer(
       kRenderbufferClient1Id, kRenderbufferService1Id);
   Renderbuffer* renderbuffer1 =
       renderbuffer_manager_->GetRenderbuffer(kRenderbufferClient1Id);
-  ASSERT_TRUE(renderbuffer1 != NULL);
+  ASSERT_TRUE(renderbuffer1 != nullptr);
   texture_manager_->CreateTexture(kTextureClient2Id, kTextureService2Id);
   scoped_refptr<TextureRef> texture2(
       texture_manager_->GetTexture(kTextureClient2Id));
-  ASSERT_TRUE(texture2.get() != NULL);
+  ASSERT_TRUE(texture2.get() != nullptr);
 
   // Check MarkAsComlete marks as complete.
   manager_.MarkAsComplete(framebuffer_);
   EXPECT_TRUE(manager_.IsComplete(framebuffer_));
 
   // Check at attaching marks as not complete.
   framebuffer_->AttachTexture(
       GL_COLOR_ATTACHMENT0, texture2.get(), kTarget1, kLevel1, kSamples1);
   EXPECT_FALSE(manager_.IsComplete(framebuffer_));
   manager_.MarkAsComplete(framebuffer_);
@@ skipping 21 matching lines @@
   const GLuint kTextureClient2Id = 34;
   const GLuint kTextureService2Id = 334;
   const GLenum kTarget1 = GL_TEXTURE_2D;
   const GLint kLevel1 = 0;
   const GLint kSamples1 = 0;
 
   renderbuffer_manager_->CreateRenderbuffer(
       kRenderbufferClient1Id, kRenderbufferService1Id);
   Renderbuffer* renderbuffer1 =
       renderbuffer_manager_->GetRenderbuffer(kRenderbufferClient1Id);
-  ASSERT_TRUE(renderbuffer1 != NULL);
+  ASSERT_TRUE(renderbuffer1 != nullptr);
   texture_manager_->CreateTexture(kTextureClient2Id, kTextureService2Id);
   scoped_refptr<TextureRef> texture2(
       texture_manager_->GetTexture(kTextureClient2Id));
-  ASSERT_TRUE(texture2.get() != NULL);
+  ASSERT_TRUE(texture2.get() != nullptr);
   texture_manager_->SetTarget(texture2.get(), GL_TEXTURE_2D);
 
   EXPECT_CALL(*gl_, CheckFramebufferStatusEXT(GL_FRAMEBUFFER))
       .WillOnce(Return(GL_FRAMEBUFFER_COMPLETE))
       .RetiresOnSaturation();
   framebuffer_->GetStatus(texture_manager_.get(), GL_FRAMEBUFFER);
 
   // Check a second call for the same type does not call anything
   framebuffer_->GetStatus(texture_manager_.get(), GL_FRAMEBUFFER);
 
@@ skipping 71 matching lines @@
 
   void InitializeContext(const char* gl_version, const char* extensions) {
     GpuServiceTest::SetUpWithGLVersion(gl_version, extensions);
     TestHelper::SetupFeatureInfoInitExpectationsWithGLVersion(gl_.get(),
         extensions, "", gl_version);
     feature_info_->InitializeForTesting(CONTEXT_TYPE_OPENGLES3);
     decoder_.reset(new MockGLES2Decoder());
     manager_.CreateFramebuffer(kClient1Id, kService1Id);
     error_state_.reset(new ::testing::StrictMock<gles2::MockErrorState>());
     framebuffer_ = manager_.GetFramebuffer(kClient1Id);
-    ASSERT_TRUE(framebuffer_ != NULL);
+    ASSERT_TRUE(framebuffer_ != nullptr);
   }
 };
 
 TEST_F(FramebufferInfoES3Test, DifferentDimensions) {
   const GLuint kRenderbufferClient1Id = 33;
   const GLuint kRenderbufferService1Id = 333;
   const GLuint kRenderbufferClient2Id = 34;
   const GLuint kRenderbufferService2Id = 334;
   const GLsizei kWidth1 = 16;
   const GLsizei kHeight1 = 32;
   const GLenum kFormat1 = GL_RGBA4;
   const GLsizei kSamples1 = 0;
   const GLsizei kWidth2 = 32;  // Different from kWidth1
   const GLsizei kHeight2 = 32;
   const GLenum kFormat2 = GL_DEPTH_COMPONENT16;
   const GLsizei kSamples2 = 0;
 
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_COLOR_ATTACHMENT0));
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_DEPTH_ATTACHMENT));
   EXPECT_FALSE(framebuffer_->HasUnclearedAttachment(GL_STENCIL_ATTACHMENT));
   EXPECT_FALSE(
       framebuffer_->HasUnclearedAttachment(GL_DEPTH_STENCIL_ATTACHMENT));
 
   renderbuffer_manager_->CreateRenderbuffer(
       kRenderbufferClient1Id, kRenderbufferService1Id);
   Renderbuffer* renderbuffer1 =
       renderbuffer_manager_->GetRenderbuffer(kRenderbufferClient1Id);
-  ASSERT_TRUE(renderbuffer1 != NULL);
+  ASSERT_TRUE(renderbuffer1 != nullptr);
   renderbuffer_manager_->SetInfo(
       renderbuffer1, kSamples1, kFormat1, kWidth1, kHeight1);
   framebuffer_->AttachRenderbuffer(GL_COLOR_ATTACHMENT0, renderbuffer1);
 
   renderbuffer_manager_->CreateRenderbuffer(
       kRenderbufferClient2Id, kRenderbufferService2Id);
   Renderbuffer* renderbuffer2 =
       renderbuffer_manager_->GetRenderbuffer(kRenderbufferClient2Id);
-  ASSERT_TRUE(renderbuffer2 != NULL);
+  ASSERT_TRUE(renderbuffer2 != nullptr);
   renderbuffer_manager_->SetInfo(
       renderbuffer2, kSamples2, kFormat2, kWidth2, kHeight2);
   framebuffer_->AttachRenderbuffer(GL_DEPTH_ATTACHMENT, renderbuffer2);
 
   EXPECT_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT),
             framebuffer_->IsPossiblyComplete(feature_info_.get()));
 }
 
 TEST_F(FramebufferInfoES3Test, DuplicatedAttachments) {
   const GLuint kTextureClientId = 33;
@@ skipping 37 matching lines @@
   EXPECT_EQ(static_cast<GLenum>(GL_NONE), framebuffer_->read_buffer());
   EXPECT_FALSE(framebuffer_->GetReadBufferAttachment());
 
   framebuffer_->set_read_buffer(GL_COLOR_ATTACHMENT1);
   EXPECT_FALSE(framebuffer_->GetReadBufferAttachment());
 
   renderbuffer_manager_->CreateRenderbuffer(
       kRenderbufferClientId, kRenderbufferServiceId);
   Renderbuffer* renderbuffer =
       renderbuffer_manager_->GetRenderbuffer(kRenderbufferClientId);
-  ASSERT_TRUE(renderbuffer != NULL);
+  ASSERT_TRUE(renderbuffer != nullptr);
   framebuffer_->AttachRenderbuffer(GL_COLOR_ATTACHMENT1, renderbuffer);
   EXPECT_TRUE(framebuffer_->GetReadBufferAttachment());
 }
 
 }  // namespace gles2
 }  // namespace gpu