commit 60ec6ea70370741bd002525a15be2713ff3597ff
author Jamie Madill <jmadill@chromium.org> Fri Jan 22 15:27:19 2016 -0500
committer Jamie Madill <jmadill@chromium.org> Mon Jan 25 20:34:18 2016 +0000
tree 3565f52e031242f39328459fee126b4d11a84fea
parent b8d283990c32a4ddaac401094c1dd993c6997828

Implement dirty bits for Framebuffer.

The dirty bits set the stage for performance improvements in D3D, but
don't actually reduce any of the redundant work just yet.

BUG=angleproject:1260

Change-Id: Ib84e6a9b7aa40c37c41790f492361b22faaf4742
Reviewed-on: https://chromium-review.googlesource.com/318730
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tryjob-Request: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/validationES_unittest.cpp

diff --git a/src/libANGLE/validationES_unittest.cpp b/src/libANGLE/validationES_unittest.cpp
index 8d8d13a..ef049f9 100644
--- a/src/libANGLE/validationES_unittest.cpp
+++ b/src/libANGLE/validationES_unittest.cpp
@@ -20,6 +20,7 @@
 using namespace gl;
 using namespace rx;
 using testing::_;
+using testing::NiceMock;
 using testing::Return;
 
 namespace
@@ -72,19 +73,11 @@
 // but we want a test to ensure we maintain this behaviour.
 TEST(ValidationESTest, DrawElementsWithMaxIndexGivesError)
 {
+    auto framebufferImpl = MakeFramebufferMock();
+    auto programImpl     = MakeProgramMock();
+
     // TODO(jmadill): Generalize some of this code so we can re-use it for other tests.
-    MockFramebufferImpl *framebufferImpl = new MockFramebufferImpl();
-    EXPECT_CALL(*framebufferImpl, onUpdateColorAttachment(_)).Times(1).RetiresOnSaturation();
-    EXPECT_CALL(*framebufferImpl, checkStatus())
-        .Times(2)
-        .WillOnce(Return(true))
-        .WillOnce(Return(true));
-    EXPECT_CALL(*framebufferImpl, destroy()).Times(1).RetiresOnSaturation();
-
-    MockProgramImpl *programImpl = new MockProgramImpl();
-    EXPECT_CALL(*programImpl, destroy());
-
-    MockFactory mockFactory;
+    NiceMock<MockFactory> mockFactory;
     EXPECT_CALL(mockFactory, createFramebuffer(_)).WillOnce(Return(framebufferImpl));
     EXPECT_CALL(mockFactory, createProgram(_)).WillOnce(Return(programImpl));
     EXPECT_CALL(mockFactory, createVertexArray(_)).WillOnce(Return(nullptr));
@@ -101,9 +94,10 @@
     caps.maxColorAttachments = 1;
     state.initialize(caps, extensions, 3, false);
 
-    MockTextureImpl *textureImpl = new MockTextureImpl();
+    NiceMock<MockTextureImpl> *textureImpl = new NiceMock<MockTextureImpl>();
     EXPECT_CALL(*textureImpl, setStorage(_, _, _, _)).WillOnce(Return(Error(GL_NO_ERROR)));
     EXPECT_CALL(*textureImpl, destructor()).Times(1).RetiresOnSaturation();
+
     Texture *texture = new Texture(textureImpl, 0, GL_TEXTURE_2D);
     texture->addRef();
     texture->setStorage(GL_TEXTURE_2D, 1, GL_RGBA8, Extents(1, 1, 0));
@@ -118,8 +112,8 @@
     state.setDrawFramebufferBinding(framebuffer);
     state.setProgram(program);
 
-    MockValidationContext testContext(3, state, caps, textureCaps, extensions, nullptr, limitations,
-                                      false);
+    NiceMock<MockValidationContext> testContext(3, state, caps, textureCaps, extensions, nullptr,
+                                                limitations, false);
 
     // Set the expectation for the validation error here.
     Error expectedError(GL_INVALID_OPERATION, g_ExceedsMaxElementErrorMessage);