mIsRenderable is only valid when there is a texture.

TRAC #18714 Signed-off-by: Daniel Koch Author: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/trunk@835 736b8ea6-26fd-11df-bfd4-992fa37f6226

mIsRenderable is only valid when there is a texture.
9d4eac7a · daniel@transgaming.com · 90cfcc95 · 9d4eac7a
Commit 9d4eac7a authored Nov 09, 2011 by daniel@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 17 deletions

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

No files found.
--- a/src/libGLESv2/Texture.cpp
+++ b/src/libGLESv2/Texture.cpp
@@ -1583,7 +1583,6 @@ void Texture2D::redefineImage(GLint level, GLenum format, GLsizei width, GLsizei
        mTexture->Release();
        mTexture = NULL;
        mDirtyImages = true;
-        mIsRenderable = false;

        if (mSurface)
        {
@@ -2016,14 +2015,8 @@ void Texture2D::generateMipmaps()
                                mImageArray[0].getType());
    }

-    if (mIsRenderable)
+    if (mTexture && mIsRenderable)
    {
-        if (mTexture == NULL)
-        {
-            ERR(" failed because mTexture was null.");
-            return;
-        }
-
        for (unsigned int i = 1; i <= q; i++)
        {
            IDirect3DSurface9 *upper = NULL;
@@ -2081,7 +2074,7 @@ IDirect3DSurface9 *Texture2D::getRenderTarget(GLenum target)
 {
    ASSERT(target == GL_TEXTURE_2D);

-    if (!mIsRenderable)
+    if (!mTexture || !mIsRenderable)
    {
        convertToRenderTarget();
    }
@@ -2503,7 +2496,6 @@ void TextureCubeMap::redefineImage(int face, GLint level, GLenum format, GLsizei
        mTexture->Release();
        mTexture = NULL;
        mDirtyImages = true;
-        mIsRenderable = false;
    }
 }

@@ -2667,13 +2659,8 @@ void TextureCubeMap::generateMipmaps()
        }
    }

-    if (mIsRenderable)
+    if (mTexture && mIsRenderable)
    {
-        if (mTexture == NULL)
-        {
-            return;
-        }
-
        for (unsigned int f = 0; f < 6; f++)
        {
            for (unsigned int i = 1; i <= q; i++)
@@ -2736,7 +2723,7 @@ IDirect3DSurface9 *TextureCubeMap::getRenderTarget(GLenum target)
 {
    ASSERT(IsCubemapTextureTarget(target));

-    if (!mIsRenderable)
+    if (!mTexture || !mIsRenderable)
    {
        convertToRenderTarget();
    }