diff options
| author |  csmartdalton <csmartdalton@google.com> | 2016-07-29 08:14:20 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-29 08:14:20 -0700 |
| commit | e0d362929d6569e8737d80dead791c640390e819 (patch) | |
| tree | 3943140ef518a4fc3962672a74039cb776f1ef48 /src/gpu/GrDrawingManager.cpp | |
| parent | 0d9990f052670a8af29e1e775c414810f8fc6e86 (diff) | |
Add test configs for instanced rendering
Adds the following configs and enables them on select bots:
glinst, glinst4, glinstdit4, glinst16, glinstdit16,
esinst, esinst4, esinstdit4
Makes general changes to GrContextOptions, GrCaps, etc. to facilitate
this.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2182783004
Review-Url: https://codereview.chromium.org/2182783004
Diffstat (limited to 'src/gpu/GrDrawingManager.cpp')
| -rw-r--r-- | src/gpu/GrDrawingManager.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp index 5dc07dd960..840c50f5e0 100644 --- a/src/gpu/GrDrawingManager.cpp +++ b/src/gpu/GrDrawingManager.cpp @@ -45,7 +45,8 @@ GrDrawingManager::~GrDrawingManager() { void GrDrawingManager::abandon() { fAbandoned = true; for (int i = 0; i < fDrawTargets.count(); ++i) { - if (InstancedRendering* ir = fDrawTargets[i]->instancedRendering()) { + if (GrCaps::InstancedSupport::kNone != fContext->caps()->instancedSupport()) { + InstancedRendering* ir = fDrawTargets[i]->instancedRendering(); ir->resetGpuResources(InstancedRendering::ResetType::kAbandon); } } @@ -58,7 +59,8 @@ void GrDrawingManager::freeGpuResources() { fPathRendererChain = nullptr; SkSafeSetNull(fSoftwarePathRenderer); for (int i = 0; i < fDrawTargets.count(); ++i) { - if (InstancedRendering* ir = fDrawTargets[i]->instancedRendering()) { + if (GrCaps::InstancedSupport::kNone != fContext->caps()->instancedSupport()) { + InstancedRendering* ir = fDrawTargets[i]->instancedRendering(); ir->resetGpuResources(InstancedRendering::ResetType::kDestroy); } } |