Changes the Image array contained in Texture classes to an array of Image pointers.

TRAC #22254 Author: Shannon Woods Signed-off-by: Geoff Lang Signed-off-by: Daniel Koch git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1568 736b8ea6-26fd-11df-bfd4-992fa37f6226

Changes the Image array contained in Texture classes to an array of Image pointers.
d9ec9022 · daniel@transgaming.com · e4e1a33c · d9ec9022 · d9ec9022
Commit d9ec9022 authored Dec 20, 2012 by daniel@transgaming.com
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Texture.cpp src/libGLESv2/Texture.cpp +0 -0

Texture.h src/libGLESv2/Texture.h +2 -2

No files found.
--- a/src/libGLESv2/Texture.cpp
+++ b/src/libGLESv2/Texture.cpp
--- a/src/libGLESv2/Texture.h
+++ b/src/libGLESv2/Texture.h
@@ -191,7 +191,7 @@ class Texture2D : public Texture
    void redefineImage(GLint level, GLint internalformat, GLsizei width, GLsizei height);
    void commitRect(GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height);

-    rx::Image mImageArray[IMPLEMENTATION_MAX_TEXTURE_LEVELS];
+    rx::Image *mImageArray[IMPLEMENTATION_MAX_TEXTURE_LEVELS];

    rx::TextureStorage2D *mTexStorage;
    egl::Surface *mSurface;
@@ -266,7 +266,7 @@ class TextureCubeMap : public Texture
    void commitRect(int faceIndex, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height);
    void redefineImage(int faceIndex, GLint level, GLint internalformat, GLsizei width, GLsizei height);

-    rx::Image mImageArray[6][IMPLEMENTATION_MAX_TEXTURE_LEVELS];
+    rx::Image *mImageArray[6][IMPLEMENTATION_MAX_TEXTURE_LEVELS];

    rx::TextureStorageCubeMap *mTexStorage;