diff options
author | Greg Daniel <egdaniel@google.com> | 2018-06-08 22:01:16 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-08 22:01:23 +0000 |
commit | 01422bc8eff0c317b9c234b3b4f5a82f1011dfce (patch) | |
tree | 35231fa8629686043413de7e96012985f158eaf5 /src/gpu | |
parent | e8b38ab432faf419a6cc092082c34c233800ccea (diff) |
Revert "Reland "Require mips to be allocated at texture creation time and disable late allocations.""
This reverts commit 9eb36b9eb8e81e970e02fa985ae82fe64de0a8f0.
Reason for revert: Alpha8 isn't renderable on es2 so we end up dropping draws on certain A8 mip requests
Original change's description:
> Reland "Require mips to be allocated at texture creation time and disable late allocations."
>
> This reverts commit 0c78238e2991c95b6fb3c945d4ad2b5d941ae21b.
>
> Reason for revert: <INSERT REASONING HERE>
>
> Original change's description:
> > Revert "Require mips to be allocated at texture creation time and disable late allocations."
> >
> > This reverts commit cd2c3f9055452d413d6be7ea6dc63fd1922fe994.
> >
> > Reason for revert: Looks to be causing angle failures on initial clear test
> >
> > Original change's description:
> > > Require mips to be allocated at texture creation time and disable late allocations.
> > >
> > > If we get a non-mipped texture for a draw that wants to be use mip map filter, we
> > > will copy the texture into a new mipped texture.
> > >
> > > Clean up of unused code in the GPU backends for reallocating for mips will be done
> > > in a follow up CL.
> > >
> > > Bug: skia:
> > > Change-Id: Idab588c1abf4bbbf7eeceb3727d500e5df274188
> > > Reviewed-on: https://skia-review.googlesource.com/132830
> > > Reviewed-by: Brian Salomon <bsalomon@google.com>
> > > Commit-Queue: Greg Daniel <egdaniel@google.com>
> >
> >
> >
> > Change-Id: I49f0ace52f2586d61b451630b2e6aae84b420b81
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Bug: skia:
> > Reviewed-on: https://skia-review.googlesource.com/133041
> > Reviewed-by: Greg Daniel <egdaniel@google.com>
> > Commit-Queue: Greg Daniel <egdaniel@google.com>
>
> Bug: skia:
> Change-Id: I004447a5f1ec72c3be2318ddea803f57efb12ea4
> Reviewed-on: https://skia-review.googlesource.com/133340
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com
Change-Id: I9e9718d380c4d9927ec39e46008750ab7396391f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/133680
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/gpu')
-rw-r--r-- | src/gpu/GrBackendTextureImageGenerator.cpp | 6 | ||||
-rw-r--r-- | src/gpu/GrBitmapTextureMaker.cpp | 4 | ||||
-rw-r--r-- | src/gpu/GrGpu.cpp | 58 | ||||
-rw-r--r-- | src/gpu/GrSurfacePriv.h | 1 | ||||
-rw-r--r-- | src/gpu/GrTexture.cpp | 8 | ||||
-rw-r--r-- | src/gpu/GrTextureAdjuster.cpp | 18 | ||||
-rw-r--r-- | src/gpu/GrTexturePriv.h | 4 | ||||
-rw-r--r-- | src/gpu/GrTextureProducer.cpp | 27 | ||||
-rw-r--r-- | src/gpu/GrTextureProxyPriv.h | 5 | ||||
-rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 16 | ||||
-rw-r--r-- | src/gpu/gl/GrGLCaps.h | 4 | ||||
-rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 2 | ||||
-rw-r--r-- | src/gpu/ops/GrTextureOp.cpp | 14 | ||||
-rw-r--r-- | src/gpu/vk/GrVkGpuCommandBuffer.cpp | 1 |
14 files changed, 84 insertions, 84 deletions
diff --git a/src/gpu/GrBackendTextureImageGenerator.cpp b/src/gpu/GrBackendTextureImageGenerator.cpp index 4147abd2a4..56826d2857 100644 --- a/src/gpu/GrBackendTextureImageGenerator.cpp +++ b/src/gpu/GrBackendTextureImageGenerator.cpp @@ -180,6 +180,12 @@ sk_sp<GrTextureProxy> GrBackendTextureImageGenerator::onGenerateTexture( return nullptr; } + // We can't pass the fact that this creates a wrapped texture into createLazyProxy so we need + // to manually call setDoesNotSupportMipMaps. + if (GrMipMapped::kNo == mipMapped) { + proxy->texPriv().setDoesNotSupportMipMaps(); + } + if (0 == origin.fX && 0 == origin.fY && info.width() == fBackendTexture.width() && info.height() == fBackendTexture.height() && (!willNeedMipMaps || GrMipMapped::kYes == proxy->mipMapped())) { diff --git a/src/gpu/GrBitmapTextureMaker.cpp b/src/gpu/GrBitmapTextureMaker.cpp index 4ecd761e37..d2a1fbe3e9 100644 --- a/src/gpu/GrBitmapTextureMaker.cpp +++ b/src/gpu/GrBitmapTextureMaker.cpp @@ -89,6 +89,10 @@ sk_sp<GrTextureProxy> GrBitmapTextureMaker::refOriginalTextureProxy(bool willBeM } return mippedProxy; } + // We failed to make a mipped proxy with the base copied into it. This could have + // been from failure to make the proxy or failure to do the copy. Thus we will fall + // back to just using the non mipped proxy; See skbug.com/7094. + return proxy; } return nullptr; } diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp index 8781cbfe6d..5c2864db3c 100644 --- a/src/gpu/GrGpu.cpp +++ b/src/gpu/GrGpu.cpp @@ -50,34 +50,13 @@ bool GrGpu::IsACopyNeededForTextureParams(const GrCaps* caps, GrTextureProxy* te const GrSamplerState& textureParams, GrTextureProducer::CopyParams* copyParams, SkScalar scaleAdjust[2]) { - if (textureParams.isRepeated() && !caps->npotTextureTileSupport() && - (!SkIsPow2(width) || !SkIsPow2(height))) { - SkASSERT(scaleAdjust); - copyParams->fWidth = GrNextPow2(width); - copyParams->fHeight = GrNextPow2(height); - SkASSERT(scaleAdjust); - scaleAdjust[0] = ((SkScalar)copyParams->fWidth) / width; - scaleAdjust[1] = ((SkScalar)copyParams->fHeight) / height; - switch (textureParams.filter()) { - case GrSamplerState::Filter::kNearest: - copyParams->fFilter = GrSamplerState::Filter::kNearest; - break; - case GrSamplerState::Filter::kBilerp: - case GrSamplerState::Filter::kMipMap: - // We are only ever scaling up so no reason to ever indicate kMipMap. - copyParams->fFilter = GrSamplerState::Filter::kBilerp; - break; - } - return true; - } if (texProxy) { - bool willNeedMips = GrSamplerState::Filter::kMipMap == textureParams.filter() && - caps->mipMapSupport(); // If the texture format itself doesn't support repeat wrap mode or mipmapping (and // those capabilities are required) force a copy. if ((textureParams.isRepeated() && texProxy->texPriv().isClampOnly()) || - (willNeedMips && texProxy->mipMapped() == GrMipMapped::kNo)) { + (GrSamplerState::Filter::kMipMap == textureParams.filter() && + texProxy->texPriv().doesNotSupportMipMaps())) { copyParams->fFilter = GrSamplerState::Filter::kNearest; copyParams->fWidth = texProxy->width(); copyParams->fHeight = texProxy->height(); @@ -85,6 +64,26 @@ bool GrGpu::IsACopyNeededForTextureParams(const GrCaps* caps, GrTextureProxy* te } } + if (textureParams.isRepeated() && !caps->npotTextureTileSupport() && + (!SkIsPow2(width) || !SkIsPow2(height))) { + SkASSERT(scaleAdjust); + copyParams->fWidth = GrNextPow2(width); + copyParams->fHeight = GrNextPow2(height); + SkASSERT(scaleAdjust); + scaleAdjust[0] = ((SkScalar) copyParams->fWidth) / width; + scaleAdjust[1] = ((SkScalar) copyParams->fHeight) / height; + switch (textureParams.filter()) { + case GrSamplerState::Filter::kNearest: + copyParams->fFilter = GrSamplerState::Filter::kNearest; + break; + case GrSamplerState::Filter::kBilerp: + case GrSamplerState::Filter::kMipMap: + // We are only ever scaling up so no reason to ever indicate kMipMap. + copyParams->fFilter = GrSamplerState::Filter::kBilerp; + break; + } + return true; + } return false; } @@ -139,7 +138,13 @@ sk_sp<GrTexture> GrGpu::wrapBackendTexture(const GrBackendTexture& backendTex, backendTex.height() > this->caps()->maxTextureSize()) { return nullptr; } - return this->onWrapBackendTexture(backendTex, ownership); + sk_sp<GrTexture> tex = this->onWrapBackendTexture(backendTex, ownership); + if (tex && !backendTex.hasMipMaps()) { + // Ganesh will not ever allocate mipmaps for a wrapped resource. By setting this flag here, + // it will be propagated to any proxy that wraps this texture. + tex->texturePriv().setDoesNotSupportMipMaps(); + } + return tex; } sk_sp<GrTexture> GrGpu::wrapRenderableBackendTexture(const GrBackendTexture& backendTex, @@ -158,6 +163,11 @@ sk_sp<GrTexture> GrGpu::wrapRenderableBackendTexture(const GrBackendTexture& bac return nullptr; } sk_sp<GrTexture> tex = this->onWrapRenderableBackendTexture(backendTex, sampleCnt, ownership); + if (tex && !backendTex.hasMipMaps()) { + // Ganesh will not ever allocate mipmaps for a wrapped resource. By setting this flag here, + // it will be propagated to any proxy that wraps this texture. + tex->texturePriv().setDoesNotSupportMipMaps(); + } SkASSERT(!tex || tex->asRenderTarget()); return tex; } diff --git a/src/gpu/GrSurfacePriv.h b/src/gpu/GrSurfacePriv.h index 45a097b780..5c98e3f773 100644 --- a/src/gpu/GrSurfacePriv.h +++ b/src/gpu/GrSurfacePriv.h @@ -40,6 +40,7 @@ public: GrInternalSurfaceFlags flags() const { return fSurface->fSurfaceFlags; } + bool doesNotSupportMipMaps() const { return fSurface->doesNotSupportMipMaps(); } bool isGLTextureRectangleOrExternal() const { return fSurface->isGLTextureRectangleOrExternal(); } diff --git a/src/gpu/GrTexture.cpp b/src/gpu/GrTexture.cpp index 0051a225ef..cd3e7055ab 100644 --- a/src/gpu/GrTexture.cpp +++ b/src/gpu/GrTexture.cpp @@ -25,8 +25,14 @@ void GrTexture::markMipMapsDirty() { } void GrTexture::markMipMapsClean() { - SkASSERT(GrMipMapsStatus::kNotAllocated != fMipMapsStatus); + const bool sizeChanged = GrMipMapsStatus::kNotAllocated == fMipMapsStatus; fMipMapsStatus = GrMipMapsStatus::kValid; + if (sizeChanged) { + // This must not be called until after changing fMipMapsStatus. + this->didChangeGpuMemorySize(); + // TODO(http://skbug.com/4548) - The desc and scratch key should be + // updated to reflect the newly-allocated mipmaps. + } } size_t GrTexture::onGpuMemorySize() const { diff --git a/src/gpu/GrTextureAdjuster.cpp b/src/gpu/GrTextureAdjuster.cpp index cb296f9ce9..cc61533044 100644 --- a/src/gpu/GrTextureAdjuster.cpp +++ b/src/gpu/GrTextureAdjuster.cpp @@ -43,11 +43,10 @@ sk_sp<GrTextureProxy> GrTextureAdjuster::refTextureProxyCopy(const CopyParams& c GrUniqueKey key; this->makeCopyKey(copyParams, &key, nullptr); - sk_sp<GrTextureProxy> cachedCopy; if (key.isValid()) { - cachedCopy = proxyProvider->findOrCreateProxyByUniqueKey(key, - this->originalProxy()->origin()); - if (cachedCopy && (!willBeMipped || GrMipMapped::kYes == cachedCopy->mipMapped())) { + sk_sp<GrTextureProxy> cachedCopy = + proxyProvider->findOrCreateProxyByUniqueKey(key, this->originalProxy()->origin()); + if (cachedCopy) { return cachedCopy; } } @@ -58,14 +57,6 @@ sk_sp<GrTextureProxy> GrTextureAdjuster::refTextureProxyCopy(const CopyParams& c if (copy) { if (key.isValid()) { SkASSERT(copy->origin() == this->originalProxy()->origin()); - if (cachedCopy) { - SkASSERT(GrMipMapped::kYes == copy->mipMapped() && - GrMipMapped::kNo == cachedCopy->mipMapped()); - // If we had a cachedProxy, that means there already is a proxy in the cache which - // matches the key, but it does not have mip levels and we require them. Thus we - // must remove the unique key from that proxy. - proxyProvider->removeUniqueKeyFromProxy(key, cachedCopy.get()); - } proxyProvider->assignUniqueKeyToProxy(key, copy.get()); this->didCacheCopy(key); } @@ -98,8 +89,7 @@ sk_sp<GrTextureProxy> GrTextureAdjuster::onRefTextureProxyForParams( return proxy; } - bool willBeMipped = GrSamplerState::Filter::kMipMap == params.filter() && - fContext->contextPriv().caps()->mipMapSupport(); + bool willBeMipped = GrSamplerState::Filter::kMipMap == params.filter(); return this->refTextureProxyCopy(copyParams, willBeMipped); } diff --git a/src/gpu/GrTexturePriv.h b/src/gpu/GrTexturePriv.h index 2979e8bd94..4517e9e076 100644 --- a/src/gpu/GrTexturePriv.h +++ b/src/gpu/GrTexturePriv.h @@ -44,6 +44,10 @@ public: return fTexture->fMaxMipMapLevel; } + void setDoesNotSupportMipMaps() { + fTexture->setDoesNotSupportMipMaps(); + } + GrSLType samplerType() const { return fTexture->fSamplerType; } /** The filter used is clamped to this value in GrProcessor::TextureSampler. */ diff --git a/src/gpu/GrTextureProducer.cpp b/src/gpu/GrTextureProducer.cpp index 1e9c3acd16..d9fffbc410 100644 --- a/src/gpu/GrTextureProducer.cpp +++ b/src/gpu/GrTextureProducer.cpp @@ -10,7 +10,6 @@ #include "GrProxyProvider.h" #include "GrRenderTargetContext.h" #include "GrTextureProxy.h" -#include "SkGr.h" #include "SkRectPriv.h" #include "effects/GrBicubicEffect.h" #include "effects/GrSimpleTextureEffect.h" @@ -25,24 +24,6 @@ sk_sp<GrTextureProxy> GrTextureProducer::CopyOnGpu(GrContext* context, const SkRect dstRect = SkRect::MakeIWH(copyParams.fWidth, copyParams.fHeight); GrMipMapped mipMapped = dstWillRequireMipMaps ? GrMipMapped::kYes : GrMipMapped::kNo; - SkRect localRect = SkRect::MakeWH(inputProxy->width(), inputProxy->height()); - - bool needsDomain = false; - bool resizing = false; - if (copyParams.fFilter != GrSamplerState::Filter::kNearest) { - bool resizing = localRect.width() != dstRect.width() || - localRect.height() != dstRect.height(); - needsDomain = resizing && !GrProxyProvider::IsFunctionallyExact(inputProxy.get()); - } - - if (copyParams.fFilter == GrSamplerState::Filter::kNearest && !needsDomain && !resizing && - dstWillRequireMipMaps) { - sk_sp<GrTextureProxy> proxy = GrCopyBaseMipMapToTextureProxy(context, inputProxy.get()); - if (proxy) { - return proxy; - } - } - sk_sp<GrRenderTargetContext> copyRTC = context->contextPriv().makeDeferredRenderTargetContextWithFallback( SkBackingFit::kExact, dstRect.width(), dstRect.height(), inputProxy->config(), @@ -52,6 +33,14 @@ sk_sp<GrTextureProxy> GrTextureProducer::CopyOnGpu(GrContext* context, } GrPaint paint; + SkRect localRect = SkRect::MakeWH(inputProxy->width(), inputProxy->height()); + + bool needsDomain = false; + if (copyParams.fFilter != GrSamplerState::Filter::kNearest) { + bool resizing = localRect.width() != dstRect.width() || + localRect.height() != dstRect.height(); + needsDomain = resizing && !GrProxyProvider::IsFunctionallyExact(inputProxy.get()); + } if (needsDomain) { const SkRect domain = localRect.makeInset(0.5f, 0.5f); diff --git a/src/gpu/GrTextureProxyPriv.h b/src/gpu/GrTextureProxyPriv.h index 358369d516..cadd2fde63 100644 --- a/src/gpu/GrTextureProxyPriv.h +++ b/src/gpu/GrTextureProxyPriv.h @@ -31,6 +31,7 @@ public: // been instantiated or not. GrMipMapped proxyMipMapped() const { return fTextureProxy->fMipMapped; } + bool doesNotSupportMipMaps() const { return fTextureProxy->doesNotSupportMipMaps(); } bool isGLTextureRectangleOrExternal() const { return fTextureProxy->isGLTextureRectangleOrExternal(); } @@ -40,6 +41,10 @@ public: // We only support the clamp wrap mode with gl rectangle or external textures. bool isClampOnly() const { return fTextureProxy->isGLTextureRectangleOrExternal(); } + void setDoesNotSupportMipMaps() { + fTextureProxy->setDoesNotSupportMipMaps(); + } + private: explicit GrTextureProxyPriv(GrTextureProxy* textureProxy) : fTextureProxy(textureProxy) {} GrTextureProxyPriv(const GrTextureProxyPriv&) {} // unimpl diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 4f9b63fd62..e20d0137e9 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -1338,15 +1338,12 @@ void GrGLCaps::initConfigTable(const GrContextOptions& contextOptions, bool disableR8TexStorageForANGLEGL = false; bool disableSRGBRenderWithMSAAForMacAMD = false; bool disableRGB8ForMali400 = false; - bool disableGrayLumFBOForMesa = false; if (!contextOptions.fDisableDriverCorrectnessWorkarounds) { // ARB_texture_rg is part of OpenGL 3.0, but osmesa doesn't support GL_RED // and GL_RG on FBO textures. disableTextureRedForMesa = kOSMesa_GrGLRenderer == ctxInfo.renderer(); - disableGrayLumFBOForMesa = kOSMesa_GrGLRenderer == ctxInfo.renderer(); - bool isX86PowerVR = false; #if defined(SK_CPU_X86) if (kPowerVRRogue_GrGLRenderer == ctxInfo.renderer()) { @@ -1745,16 +1742,17 @@ void GrGLCaps::initConfigTable(const GrContextOptions& contextOptions, grayRedInfo.fSwizzle = GrSwizzle::RRRA(); grayRedInfo.fFlags = ConfigInfo::kTextureable_Flag; - // Leaving Gray8 as non-renderable, to keep things simple and match raster. However, we do - // enable the FBOColorAttachment_Flag so that we can bind it to an FBO for copies. - grayRedInfo.fFlags |= ConfigInfo::kFBOColorAttachment_Flag;; - if (kStandard_MSFBOType == this->msFBOType() && kGL_GrGLStandard == standard && - !disableGrayLumFBOForMesa) { +#if 0 // Leaving Gray8 as non-renderable, to keep things simple and match raster. Needs to be + // updated to support Gray8_as_Lum and Gray8_as_red if this is ever enabled. + if (this->textureRedSupport() || + (kDesktop_ARB_MSFBOType == this->msFBOType() && + ctxInfo.renderer() != kOSMesa_GrGLRenderer)) { // desktop ARB extension/3.0+ supports LUMINANCE8 as renderable. // However, osmesa fails if it used even when GL_ARB_framebuffer_object is present. // Core profile removes LUMINANCE8 support, but we should have chosen R8 in that case. - grayLumInfo.fFlags |= ConfigInfo::kFBOColorAttachment_Flag;; + fConfigTable[kGray_8_GrPixelConfig].fFlags |= allRenderFlags; } +#endif if (texStorageSupported && !isCommandBufferES2) { if (!disableR8TexStorageForANGLEGL) { grayLumInfo.fFlags |= ConfigInfo::kCanUseTexStorage_Flag; diff --git a/src/gpu/gl/GrGLCaps.h b/src/gpu/gl/GrGLCaps.h index 1596dfd9de..e258eaa57d 100644 --- a/src/gpu/gl/GrGLCaps.h +++ b/src/gpu/gl/GrGLCaps.h @@ -123,8 +123,8 @@ public: // In GL we have three ways to be able to copy. CopyTexImage, blit, and draw. CopyTexImage // requires the src to be an FBO attachment, blit requires both src and dst to be FBO // attachments, and draw requires the dst to be an FBO attachment. Thus to copy from and to - // the same config, we need that config to be bindable to an FBO. - return this->canConfigBeFBOColorAttachment(config); + // the same config, we need that config to be renderable so we can attach it to an FBO. + return this->isConfigRenderable(config, false); } bool canConfigBeFBOColorAttachment(GrPixelConfig config) const { diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index e420a09b7f..533c6b4a4a 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -2833,8 +2833,6 @@ void GrGLGpu::generateMipmaps(const GrSamplerState& params, GrGLTexture* texture return; } - SkASSERT(texture->texturePriv().mipMapped() == GrMipMapped::kYes); - // If the mips aren't dirty, we're done: if (!texture->texturePriv().mipMapsAreDirty()) { return; diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp index ec20e245b9..e76f5bc487 100644 --- a/src/gpu/ops/GrTextureOp.cpp +++ b/src/gpu/ops/GrTextureOp.cpp @@ -1046,16 +1046,10 @@ GR_DRAW_OP_TEST_DEFINE(TextureOp) { desc.fHeight = random->nextULessThan(90) + 10; desc.fWidth = random->nextULessThan(90) + 10; auto origin = random->nextBool() ? kTopLeft_GrSurfaceOrigin : kBottomLeft_GrSurfaceOrigin; - GrMipMapped mipMapped = random->nextBool() ? GrMipMapped::kYes : GrMipMapped::kNo; - SkBackingFit fit = SkBackingFit::kExact; - if (mipMapped == GrMipMapped::kNo) { - fit = random->nextBool() ? SkBackingFit::kApprox : SkBackingFit::kExact; - } + SkBackingFit fit = random->nextBool() ? SkBackingFit::kApprox : SkBackingFit::kExact; GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider(); - sk_sp<GrTextureProxy> proxy = proxyProvider->createProxy(desc, origin, mipMapped, fit, - SkBudgeted::kNo, - GrInternalSurfaceFlags::kNone); + sk_sp<GrTextureProxy> proxy = proxyProvider->createProxy(desc, origin, fit, SkBudgeted::kNo); SkRect rect = GrTest::TestRect(random); SkRect srcRect; @@ -1067,10 +1061,6 @@ GR_DRAW_OP_TEST_DEFINE(TextureOp) { GrColor color = SkColorToPremulGrColor(random->nextU()); GrSamplerState::Filter filter = (GrSamplerState::Filter)random->nextULessThan( static_cast<uint32_t>(GrSamplerState::Filter::kMipMap) + 1); - while (mipMapped == GrMipMapped::kNo && filter == GrSamplerState::Filter::kMipMap) { - filter = (GrSamplerState::Filter)random->nextULessThan( - static_cast<uint32_t>(GrSamplerState::Filter::kMipMap) + 1); - } auto csxf = GrTest::TestColorXform(random); GrAAType aaType = GrAAType::kNone; if (random->nextBool()) { diff --git a/src/gpu/vk/GrVkGpuCommandBuffer.cpp b/src/gpu/vk/GrVkGpuCommandBuffer.cpp index 552e7bc801..5493dd9890 100644 --- a/src/gpu/vk/GrVkGpuCommandBuffer.cpp +++ b/src/gpu/vk/GrVkGpuCommandBuffer.cpp @@ -621,7 +621,6 @@ static void prepare_sampled_images(const GrResourceIOProcessor& processor, // Check if we need to regenerate any mip maps if (GrSamplerState::Filter::kMipMap == sampler.samplerState().filter()) { - SkASSERT(vkTexture->texturePriv().mipMapped() == GrMipMapped::kYes); if (vkTexture->texturePriv().mipMapsAreDirty()) { gpu->generateMipmap(vkTexture, sampler.proxy()->origin()); vkTexture->texturePriv().markMipMapsClean(); |