D3D11: Enable renderable mipmap generation.

src/libANGLE/renderer/d3d/TextureD3D.cpp

@@ -475,11 +475,21 @@ angle::Result TextureD3D::generateMipmapUsingImages(const gl::Context *context,
     // We know that all layers have the same dimension, for the texture to be complete
     GLint layerCount = static_cast<GLint>(getLayerCount(mBaseLevel));
 
-    // When making mipmaps with the setData workaround enabled, the texture storage has
-    // the image data already. For non-render-target storage, we have to pull it out into
-    // an image layer.
-    if (mRenderer->getFeatures().setDataFasterThanImageUpload.enabled && mTexStorage)
+    if (mTexStorage && !mTexStorage->isRenderTarget() &&
+        canCreateRenderTargetForImage(getImageIndex(mBaseLevel, 0)) &&
+        mRenderer->getRendererClass() == RENDERER_D3D11)
     {
+        if (!mRenderer->getFeatures().setDataFasterThanImageUpload.enabled)
+        {
+            ANGLE_TRY(updateStorage(context));
+        }
+        ANGLE_TRY(ensureRenderTarget(context));
+    }
+    else if (mRenderer->getFeatures().setDataFasterThanImageUpload.enabled && mTexStorage)
+    {
+        // When making mipmaps with the setData workaround enabled, the texture storage has
+        // the image data already. For non-render-target storage, we have to pull it out into
+        // an image layer.
         if (!mTexStorage->isRenderTarget())
         {
             // Copy from the storage mip 0 to Image mip 0
@@ -530,9 +540,9 @@ angle::Result TextureD3D::generateMipmapUsingImages(const gl::Context *context,
         }
     }
 
-    mDirtyImages = true;
+    mDirtyImages = !renderableStorage;
 
-    if (mTexStorage)
+    if (mTexStorage && mDirtyImages)
     {
         ANGLE_TRY(updateStorage(context));
     }

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

@@ -659,9 +659,10 @@ angle::Result TextureStorage11::generateMipmap(const gl::Context *context,
     RenderTargetD3D *dest = nullptr;
     ANGLE_TRY(getRenderTarget(context, destIndex, 0, &dest));
 
-    RenderTarget11 *rt11                   = GetAs<RenderTarget11>(source);
-    const d3d11::SharedSRV &sourceSRV      = rt11->getBlitShaderResourceView(context);
-    const d3d11::RenderTargetView &destRTV = rt11->getRenderTargetView();
+    RenderTarget11 *srcRT11                = GetAs<RenderTarget11>(source);
+    RenderTarget11 *dstRT11                = GetAs<RenderTarget11>(dest);
+    const d3d11::SharedSRV &sourceSRV      = srcRT11->getBlitShaderResourceView(context);
+    const d3d11::RenderTargetView &destRTV = dstRT11->getRenderTargetView();
 
     gl::Box sourceArea(0, 0, 0, source->getWidth(), source->getHeight(), source->getDepth());
     gl::Extents sourceSize(source->getWidth(), source->getHeight(), source->getDepth());