Clear SRV cache on keyed mutex texture unbind from TextureStorage11_External

This fixes the same issue as https://chromium-review.googlesource.com/328400, except with NV12 external storage textures. The SRV cache thinks the texture is still bound, but releasing the keyed mutex has unbound it. BUG=625900,626524 Change-Id: I991cb3eeaaea0a1c4570b88de2ba873ae868ec2a Reviewed-on: https://chromium-review.googlesource.com/359430Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: John Bauman <jbauman@chromium.org>

Clear SRV cache on keyed mutex texture unbind from TextureStorage11_External
9585a784 · John Bauman · Commit Bot · e8d5c5c4 · 9585a784 · 9585a784
Commit 9585a784 authored Jul 08, 2016 by John Bauman Committed by Commit Bot Jul 09, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

TextureStorage11.cpp src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp +7 -0

TextureStorage11.h src/libANGLE/renderer/d3d/d3d11/TextureStorage11.h +1 -0

No files found.
--- a/src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/TextureStorage11.cpp
@@ -1420,6 +1420,7 @@ TextureStorage11_External::TextureStorage11_External(
    mTextureHeight  = desc.Height;
    mTextureDepth   = 1;
    mInternalFormat = glDesc.internalFormat;
+    mHasKeyedMutex = (desc.MiscFlags & D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX) != 0;
    const d3d11::TextureFormat &formatInfo =
        d3d11::GetTextureFormatInfo(mInternalFormat, renderer->getRenderer11DeviceCaps());
@@ -1430,6 +1431,12 @@ TextureStorage11_External::TextureStorage11_External(
 TextureStorage11_External::~TextureStorage11_External()
 {
    SafeRelease(mTexture);
+    if (mHasKeyedMutex)
+    {
+        // If the keyed mutex is released that will unbind it and cause the state cache to become
+        // desynchronized.
+        mRenderer->getStateManager()->invalidateBoundViews();
+    }
 }
 gl::Error TextureStorage11_External::copyToStorage(TextureStorage *destStorage)

--- a/src/libANGLE/renderer/d3d/d3d11/TextureStorage11.h
+++ b/src/libANGLE/renderer/d3d/d3d11/TextureStorage11.h
@@ -225,6 +225,7 @@ class TextureStorage11_External : public TextureStorage11
    ID3D11Texture2D *mTexture;
    int mSubresourceIndex;
+    bool mHasKeyedMutex;
    Image11 *mAssociatedImage;
 };