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/GrGpu.cpp | |
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/GrGpu.cpp')
-rw-r--r-- | src/gpu/GrGpu.cpp | 58 |
1 files changed, 34 insertions, 24 deletions
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; } |