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/GrTextureProducer.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/GrTextureProducer.cpp')
-rw-r--r-- | src/gpu/GrTextureProducer.cpp | 27 |
1 files changed, 8 insertions, 19 deletions
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); |