diff options
Diffstat (limited to 'src/gpu/GrGpu.cpp')
| -rw-r--r-- | src/gpu/GrGpu.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp index 5c2864db3c..c72491b3c3 100644 --- a/src/gpu/GrGpu.cpp +++ b/src/gpu/GrGpu.cpp @@ -56,7 +56,7 @@ bool GrGpu::IsACopyNeededForTextureParams(const GrCaps* caps, GrTextureProxy* te // those capabilities are required) force a copy. if ((textureParams.isRepeated() && texProxy->texPriv().isClampOnly()) || (GrSamplerState::Filter::kMipMap == textureParams.filter() && - texProxy->texPriv().doesNotSupportMipMaps())) { + texProxy->mipMapped() == GrMipMapped::kNo)) { copyParams->fFilter = GrSamplerState::Filter::kNearest; copyParams->fWidth = texProxy->width(); copyParams->fHeight = texProxy->height(); @@ -138,13 +138,7 @@ sk_sp<GrTexture> GrGpu::wrapBackendTexture(const GrBackendTexture& backendTex, backendTex.height() > this->caps()->maxTextureSize()) { return nullptr; } - 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; + return this->onWrapBackendTexture(backendTex, ownership); } sk_sp<GrTexture> GrGpu::wrapRenderableBackendTexture(const GrBackendTexture& backendTex, @@ -163,11 +157,6 @@ 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; } |