Fix the texture completeness cache.

Two silly mistakes were landed in 9aded1: * The cache was not updating the sampler state it was using to compare against new ones. * The SamplerCompletenessCache entry was being copied and not updated. BUG=709980 Change-Id: I1914ed30e24b9e48c4504da164f013a637a0b6c2 Reviewed-on: https://chromium-review.googlesource.com/475752Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>

Fix the texture completeness cache.
67f5ce42 · Geoff Lang · Commit Bot · 1e5499db · 67f5ce42 · 67f5ce42
Commit 67f5ce42 authored Apr 12, 2017 by Geoff Lang Committed by Commit Bot Apr 12, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 10 deletions

Texture.cpp src/libANGLE/Texture.cpp +8 -8

Texture.h src/libANGLE/Texture.h +0 -2

No files found.
--- a/src/libANGLE/Texture.cpp
+++ b/src/libANGLE/Texture.cpp
@@ -200,6 +200,7 @@ bool TextureState::isCubeComplete() const
 bool TextureState::isSamplerComplete(const SamplerState &samplerState,
                                     const ContextState &data) const
 {
+    bool newEntry  = false;
    auto cacheIter = mCompletenessCache.find(data.getContextID());
    if (cacheIter == mCompletenessCache.end())
    {
@@ -207,16 +208,17 @@ bool TextureState::isSamplerComplete(const SamplerState &samplerState,
        cacheIter = mCompletenessCache
                        .insert(std::make_pair(data.getContextID(), SamplerCompletenessCache()))
                        .first;
+        newEntry = true;
    }

-    auto cacheEntry = cacheIter->second;
-    if (!cacheEntry.cacheValid || cacheEntry.samplerState != samplerState)
+    SamplerCompletenessCache *cacheEntry = &cacheIter->second;
+    if (newEntry || cacheEntry->samplerState != samplerState)
    {
-        cacheEntry.cacheValid      = true;
-        cacheEntry.samplerComplete = computeSamplerCompleteness(samplerState, data);
+        cacheEntry->samplerState    = samplerState;
+        cacheEntry->samplerComplete = computeSamplerCompleteness(samplerState, data);
    }

-    return cacheEntry.samplerComplete;
+    return cacheEntry->samplerComplete;
 }

 void TextureState::invalidateCompletenessCache()
@@ -507,9 +509,7 @@ void TextureState::clearImageDescs()
 }

 TextureState::SamplerCompletenessCache::SamplerCompletenessCache()
-    : cacheValid(false),
-      samplerState(),
-      samplerComplete(false)
+    : samplerState(), samplerComplete(false)
 {
 }


--- a/src/libANGLE/Texture.h
+++ b/src/libANGLE/Texture.h
@@ -159,8 +159,6 @@ struct TextureState final : public angle::NonCopyable
    {
        SamplerCompletenessCache();

-        bool cacheValid;
-
        // All values that affect sampler completeness that are not stored within
        // the texture itself
        SamplerState samplerState;