diff options
author | Robert Phillips <robertphillips@google.com> | 2017-05-29 12:37:20 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-29 17:04:51 +0000 |
commit | 9bee2e5894bb8dd374392f238bc429e16f239583 (patch) | |
tree | 975ace2218b6911b62c9c9abceb2545cba9e5150 /src/gpu/GrFragmentProcessor.cpp | |
parent | 761717146923163991aeb32d50f05a2bdf471dc4 (diff) |
Revise system for checking for uninstantiated proxies
The new pattern is:
we will "instantiate" pipelines at flush time
at flush time we will only access the backing GrSurface by peeking
If instantiation fails we should never try to access the GrSurfaces
Change-Id: I87f7ff41bd0e84d9ca3dbdd61d3361d3d4ceefd6
Reviewed-on: https://skia-review.googlesource.com/17932
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrFragmentProcessor.cpp')
-rw-r--r-- | src/gpu/GrFragmentProcessor.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/gpu/GrFragmentProcessor.cpp b/src/gpu/GrFragmentProcessor.cpp index b0a36fce6d..70de1650ed 100644 --- a/src/gpu/GrFragmentProcessor.cpp +++ b/src/gpu/GrFragmentProcessor.cpp @@ -61,11 +61,21 @@ void GrFragmentProcessor::addCoordTransform(const GrCoordTransform* transform) { SkDEBUGCODE(transform->setInProcessor();) } -int GrFragmentProcessor::registerChildProcessor(sk_sp<GrFragmentProcessor> child) { - if (child->isBad()) { - this->markAsBad(); +bool GrFragmentProcessor::instantiate(GrResourceProvider* resourceProvider) const { + if (!INHERITED::instantiate(resourceProvider)) { + return false; } + for (int i = 0; i < this->numChildProcessors(); ++i) { + if (!this->childProcessor(i).instantiate(resourceProvider)) { + return false; + } + } + + return true; +} + +int GrFragmentProcessor::registerChildProcessor(sk_sp<GrFragmentProcessor> child) { this->combineRequiredFeatures(*child); if (child->usesLocalCoords()) { |