Use the correct d3dformat for texstorage textures.

Trac #19259 Issue=268 The image we were trying to get the d3dformat from hadn't been initialized yet. Signed-off-by: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/trunk@914 736b8ea6-26fd-11df-bfd4-992fa37f6226

Use the correct d3dformat for texstorage textures.
f71a339a · daniel@transgaming.com · 8d6252eb · f71a339a
Commit f71a339a authored Dec 16, 2011 by daniel@transgaming.com
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

Texture.cpp src/libGLESv2/Texture.cpp +4 -2

No files found.
--- a/src/libGLESv2/Texture.cpp
+++ b/src/libGLESv2/Texture.cpp
@@ -1970,9 +1970,10 @@ void Texture2D::storage(GLsizei levels, GLenum internalformat, GLsizei width, GL
 {
    GLenum format = gl::ExtractFormat(internalformat);
    GLenum type = gl::ExtractType(internalformat);
+    D3DFORMAT d3dfmt = ConvertTextureFormatType(format, type);

    delete mTexture;
-    mTexture = new TextureStorage2D(levels, mImageArray[0].getD3DFormat(), width, height, mUsage == GL_FRAMEBUFFER_ATTACHMENT_ANGLE);
+    mTexture = new TextureStorage2D(levels, d3dfmt, width, height, mUsage == GL_FRAMEBUFFER_ATTACHMENT_ANGLE);
    mImmutable = true;

    for (int level = 0; level < levels; level++)
@@ -2829,9 +2830,10 @@ void TextureCubeMap::storage(GLsizei levels, GLenum internalformat, GLsizei size
 {
    GLenum format = gl::ExtractFormat(internalformat);
    GLenum type = gl::ExtractType(internalformat);
+    D3DFORMAT d3dfmt = ConvertTextureFormatType(format, type);

    delete mTexture;
-    mTexture = new TextureStorageCubeMap(levels, mImageArray[0][0].getD3DFormat(), size, mUsage == GL_FRAMEBUFFER_ATTACHMENT_ANGLE);
+    mTexture = new TextureStorageCubeMap(levels, d3dfmt, size, mUsage == GL_FRAMEBUFFER_ATTACHMENT_ANGLE);
    mImmutable = true;

    for (int level = 0; level < IMPLEMENTATION_MAX_TEXTURE_LEVELS; level++)