commit 8897afa1cb041494e3dcc80d47b717e259774338
author Jamie Madill <jmadill@chromium.org> Mon Feb 06 17:17:23 2017 -0500
committer Commit Bot <commit-bot@chromium.org> Tue Feb 07 18:21:33 2017 +0000
tree 822bf92cd27cf0ae8b6dcbb0296ec6d26d6685ec
parent a631e93b3349e18e9f4710ed8571b02b75cd7b4b

Pass Context around to Texture::copyImage.

Passing this through the chain will allow us to have access to the
platform methods, as well as be useful in the future for Vulkan.

BUG=angleproject:1660

Change-Id: I819984fceeb5a2a299aa54e59ef3b428f5f9c91f
Reviewed-on: https://chromium-review.googlesource.com/438684
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: 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 3bc0ce9..7a23026 100644
--- a/src/libANGLE/validationES_unittest.cpp
+++ b/src/libANGLE/validationES_unittest.cpp
@@ -80,12 +80,12 @@
 
     NiceMock<MockTextureImpl> *textureImpl = new NiceMock<MockTextureImpl>();
     EXPECT_CALL(mockFactory, createTexture(_)).WillOnce(Return(textureImpl));
-    EXPECT_CALL(*textureImpl, setStorage(_, _, _, _)).WillOnce(Return(NoError()));
+    EXPECT_CALL(*textureImpl, setStorage(_, _, _, _, _)).WillOnce(Return(NoError()));
     EXPECT_CALL(*textureImpl, destructor()).Times(1).RetiresOnSaturation();
 
     Texture *texture = new Texture(&mockFactory, 0, GL_TEXTURE_2D);
     texture->addRef();
-    texture->setStorage(GL_TEXTURE_2D, 1, GL_RGBA8, Extents(1, 1, 0));
+    texture->setStorage(nullptr, GL_TEXTURE_2D, 1, GL_RGBA8, Extents(1, 1, 0));
 
     VertexArray *vertexArray = new VertexArray(&mockFactory, 0, 1);
     Framebuffer *framebuffer = new Framebuffer(caps, &mockFactory, 1);