commit 3bf2f3a9da6ebee19de0085281a409161eee7d74
author Chris Dalton <csmartdalton@google.com> Tue Mar 17 11:48:23 2020 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Mar 17 19:12:18 2020 +0000
tree 56c5a7067896b4f19df127208c27a80bcabcd215
parent dbb833b45702f1c87c622eccbd1830719748379c

Remove DynamicStateArrays from GrProgramInfo and GrPipeline

Every op that updates dynamic state between draws has now been
migrated to explicit binding.

Change-Id: Ibd13c9c0ffb16a205c073dfb4fd21d93f496dc52
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/277493
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

src/gpu/GrOpsRenderPass.cpp

diff --git a/src/gpu/GrOpsRenderPass.cpp b/src/gpu/GrOpsRenderPass.cpp
index fb3b91e..9d790e0 100644
--- a/src/gpu/GrOpsRenderPass.cpp
+++ b/src/gpu/GrOpsRenderPass.cpp
@@ -122,8 +122,21 @@
 #ifdef SK_DEBUG
     SkASSERT((primProc.numTextureSamplers() > 0) == SkToBool(primProcTextures));
     for (int i = 0; i < primProc.numTextureSamplers(); ++i) {
-        SkASSERT(primProcTextures[i]->backendFormat() ==
-                 primProc.textureSampler(i).backendFormat());
+        const auto& sampler = primProc.textureSampler(i);
+        const GrSurfaceProxy* proxy = primProcTextures[i];
+        SkASSERT(proxy);
+        SkASSERT(proxy->backendFormat() == sampler.backendFormat());
+        SkASSERT(proxy->backendFormat().textureType() == sampler.backendFormat().textureType());
+
+        const GrTexture* tex = proxy->peekTexture();
+        SkASSERT(tex);
+        if (GrSamplerState::Filter::kMipMap == sampler.samplerState().filter() &&
+            (tex->width() != 1 || tex->height() != 1)) {
+            // There are some cases where we might be given a non-mipmapped texture with a mipmap
+            // filter. See skbug.com/7094.
+            SkASSERT(tex->texturePriv().mipMapped() != GrMipMapped::kYes ||
+                     !tex->texturePriv().mipMapsAreDirty());
+        }
     }
 #endif