Revert "Clear image descs on Impl errors."

src/libANGLE/Texture.cpp

@@ -170,8 +170,6 @@ Error Texture::setImage(GLenum target, size_t level, GLenum internalFormat, cons
     Error error = mTexture->setImage(target, level, internalFormat, size, format, type, unpack, pixels);
     if (error.isError())
     {
-        // May be broken at the impl level
-        clearImageDescs();
         return error;
     }
 
@@ -198,8 +196,6 @@ Error Texture::setCompressedImage(GLenum target, size_t level, GLenum internalFo
     Error error = mTexture->setCompressedImage(target, level, internalFormat, size, unpack, pixels);
     if (error.isError())
     {
-        // May be broken at the impl level
-        clearImageDescs();
         return error;
     }
 
@@ -226,8 +222,6 @@ Error Texture::copyImage(GLenum target, size_t level, const Rectangle &sourceAre
     Error error = mTexture->copyImage(target, level, sourceArea, internalFormat, source);
     if (error.isError())
     {
-        // May be broken at the impl level
-        clearImageDescs();
         return error;
     }
 
@@ -254,8 +248,6 @@ Error Texture::setStorage(GLenum target, size_t levels, GLenum internalFormat, c
     Error error = mTexture->setStorage(target, levels, internalFormat, size);
     if (error.isError())
     {
-        // May be broken at the impl level
-        clearImageDescs();
         return error;
     }
 
@@ -274,8 +266,6 @@ Error Texture::generateMipmaps()
     Error error = mTexture->generateMipmaps(getSamplerState());
     if (error.isError())
     {
-        // May be broken at the impl level
-        clearImageDescs();
         return error;
     }
 

src/libANGLE/renderer/d3d/TextureD3D.cpp

@@ -78,8 +78,7 @@ TextureD3D::TextureD3D(RendererD3D *renderer)
       mUsage(GL_NONE),
       mDirtyImages(true),
       mImmutable(false),
-      mTexStorage(NULL),
-      mTriedToInitIncompleteStorage(false)
+      mTexStorage(NULL)
 {
 }
 
@@ -1074,8 +1073,6 @@ gl::Error TextureD3D_2D::initializeStorage(bool renderTarget)
     // do not attempt to create storage for nonexistant data
     if (!isLevelComplete(0))
     {
-        // TODO(jmadill): remove this debugging code after we fix the bug
-        mTriedToInitIncompleteStorage = true;
         return gl::Error(GL_NO_ERROR);
     }
 

src/libANGLE/renderer/d3d/TextureD3D.h

@@ -103,10 +103,6 @@ class TextureD3D : public TextureImpl
     bool mImmutable;
     TextureStorage *mTexStorage;
 
-    // TODO(jmadill): remove this debugging code after we fix the bug
-    friend class Renderer11;
-    bool mTriedToInitIncompleteStorage;
-
   private:
     virtual gl::Error initializeStorage(bool renderTarget) = 0;
 

src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp

@@ -791,15 +791,7 @@ gl::Error Renderer11::setSamplerState(gl::SamplerType type, int index, gl::Textu
     // Storage should exist, texture should be complete
     ASSERT(storage);
 
-    // TODO(jmadill): remove this debugging code after we fix the bug
-    if (!storage && textureD3D->mTriedToInitIncompleteStorage)
-    {
-        samplerStateInternal.baseLevel += storage->getTopLevel();
-    }
-    else
-    {
-        samplerStateInternal.baseLevel += storage->getTopLevel();
-    }
+    samplerStateInternal.baseLevel += storage->getTopLevel();
 
     if (type == gl::SAMPLER_PIXEL)
     {