diff options
| author | Jamie Madill <jmadill@chromium.org> | 2014-09-17 13:03:29 -0400 |
|---|---|---|
| committer | Jamie Madill <jmadill@chromium.org> | 2014-09-17 20:30:38 +0000 |
| commit | feda4d294070333234b64a837eae2ba166f153a1 (patch) | |
| tree | 1e11485eb97fc14a8606c96630a123ca491eee04 /src/libGLESv2/renderer/d3d/TextureD3D.h | |
| parent | e6256f87c3f3b754f2bbe19cc817b1140cecc4fc (diff) | |
| download | angle-feda4d294070333234b64a837eae2ba166f153a1.tar.gz | |
Accept ImageIndex in TextureD3D::subImage and getImage.
This paves the way for setting data on the TextureStorage directly
instead of working through the Image objects.
BUG=angle:741
Change-Id: I3be3d5f9b2e45707c1630b74ad3f4789e034c3fd
Reviewed-on: https://chromium-review.googlesource.com/218311
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
Diffstat (limited to 'src/libGLESv2/renderer/d3d/TextureD3D.h')
| -rw-r--r-- | src/libGLESv2/renderer/d3d/TextureD3D.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libGLESv2/renderer/d3d/TextureD3D.h b/src/libGLESv2/renderer/d3d/TextureD3D.h index e8fbe846..1ede45e2 100644 --- a/src/libGLESv2/renderer/d3d/TextureD3D.h +++ b/src/libGLESv2/renderer/d3d/TextureD3D.h @@ -58,7 +58,7 @@ class TextureD3D : public TextureImpl protected: void setImage(const gl::PixelUnpackState &unpack, GLenum type, const void *pixels, Image *image); bool subImage(GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, - GLenum format, GLenum type, const gl::PixelUnpackState &unpack, const void *pixels, Image *image); + GLenum format, GLenum type, const gl::PixelUnpackState &unpack, const void *pixels, const gl::ImageIndex &index); void setCompressedImage(GLsizei imageSize, const void *pixels, Image *image); bool subImageCompressed(GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const void *pixels, Image *image); @@ -94,6 +94,7 @@ class TextureD3D_2D : public TextureD3D virtual ~TextureD3D_2D(); virtual Image *getImage(int level, int layer) const; + virtual Image *getImage(const gl::ImageIndex &index) const; virtual GLsizei getLayerCount(int level) const; GLsizei getWidth(GLint level) const; @@ -149,6 +150,7 @@ class TextureD3D_Cube : public TextureD3D virtual ~TextureD3D_Cube(); virtual Image *getImage(int level, int layer) const; + virtual Image *getImage(const gl::ImageIndex &index) const; virtual GLsizei getLayerCount(int level) const; virtual bool hasDirtyImages() const { return mDirtyImages; } @@ -206,6 +208,7 @@ class TextureD3D_3D : public TextureD3D virtual ~TextureD3D_3D(); virtual Image *getImage(int level, int layer) const; + virtual Image *getImage(const gl::ImageIndex &index) const; virtual GLsizei getLayerCount(int level) const; GLsizei getWidth(GLint level) const; @@ -262,6 +265,7 @@ class TextureD3D_2DArray : public TextureD3D virtual ~TextureD3D_2DArray(); virtual Image *getImage(int level, int layer) const; + virtual Image *getImage(const gl::ImageIndex &index) const; virtual GLsizei getLayerCount(int level) const; GLsizei getWidth(GLint level) const; |