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/renderer/vulkan/TextureVk.cpp

diff --git a/src/libANGLE/renderer/vulkan/TextureVk.cpp b/src/libANGLE/renderer/vulkan/TextureVk.cpp
index 962743b..d591ba1 100644
--- a/src/libANGLE/renderer/vulkan/TextureVk.cpp
+++ b/src/libANGLE/renderer/vulkan/TextureVk.cpp
@@ -22,7 +22,8 @@
 {
 }
 
-gl::Error TextureVk::setImage(GLenum target,
+gl::Error TextureVk::setImage(ContextImpl *contextImpl,
+                              GLenum target,
                               size_t level,
                               GLenum internalFormat,
                               const gl::Extents &size,
@@ -35,7 +36,8 @@
     return gl::Error(GL_INVALID_OPERATION);
 }
 
-gl::Error TextureVk::setSubImage(GLenum target,
+gl::Error TextureVk::setSubImage(ContextImpl *contextImpl,
+                                 GLenum target,
                                  size_t level,
                                  const gl::Box &area,
                                  GLenum format,
@@ -47,7 +49,8 @@
     return gl::Error(GL_INVALID_OPERATION);
 }
 
-gl::Error TextureVk::setCompressedImage(GLenum target,
+gl::Error TextureVk::setCompressedImage(ContextImpl *contextImpl,
+                                        GLenum target,
                                         size_t level,
                                         GLenum internalFormat,
                                         const gl::Extents &size,
@@ -59,7 +62,8 @@
     return gl::Error(GL_INVALID_OPERATION);
 }
 
-gl::Error TextureVk::setCompressedSubImage(GLenum target,
+gl::Error TextureVk::setCompressedSubImage(ContextImpl *contextImpl,
+                                           GLenum target,
                                            size_t level,
                                            const gl::Box &area,
                                            GLenum format,
@@ -71,7 +75,8 @@
     return gl::Error(GL_INVALID_OPERATION);
 }
 
-gl::Error TextureVk::copyImage(GLenum target,
+gl::Error TextureVk::copyImage(ContextImpl *contextImpl,
+                               GLenum target,
                                size_t level,
                                const gl::Rectangle &sourceArea,
                                GLenum internalFormat,
@@ -81,7 +86,8 @@
     return gl::Error(GL_INVALID_OPERATION);
 }
 
-gl::Error TextureVk::copySubImage(GLenum target,
+gl::Error TextureVk::copySubImage(ContextImpl *contextImpl,
+                                  GLenum target,
                                   size_t level,
                                   const gl::Offset &destOffset,
                                   const gl::Rectangle &sourceArea,
@@ -91,7 +97,8 @@
     return gl::Error(GL_INVALID_OPERATION);
 }
 
-gl::Error TextureVk::setStorage(GLenum target,
+gl::Error TextureVk::setStorage(ContextImpl *contextImpl,
+                                GLenum target,
                                 size_t levels,
                                 GLenum internalFormat,
                                 const gl::Extents &size)
@@ -114,7 +121,7 @@
     return gl::Error(GL_INVALID_OPERATION);
 }
 
-gl::Error TextureVk::generateMipmap()
+gl::Error TextureVk::generateMipmap(ContextImpl *contextImpl)
 {
     UNIMPLEMENTED();
     return gl::Error(GL_INVALID_OPERATION);
@@ -147,7 +154,8 @@
     UNIMPLEMENTED();
 }
 
-gl::Error TextureVk::setStorageMultisample(GLenum target,
+gl::Error TextureVk::setStorageMultisample(ContextImpl *contextImpl,
+                                           GLenum target,
                                            GLsizei samples,
                                            GLint internalformat,
                                            const gl::Extents &size,