AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Temporary patch for Mac TSAN bot (with threaded Ganesh mask generation)

Browse Source 
Change-Id: Id84e1534b00583eb2d76699386f42277d2007602
Reviewed-on: https://skia-review.googlesource.com/49900
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
This commit is contained in:
Robert Phillips 2017-09-21 15:11:03 -04:00 committed by Skia Commit-Bot
parent 85463e6ec4
commit cfbbcbe526
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gpu/GrClipStackClip.cpp
View File

@ -526,6 +526,12 @@ sk_sp<GrTextureProxy> GrClipStackClip::createSoftwareClipMask(
proxy = GrSurfaceProxy::MakeDeferred(context->resourceProvider(), desc,
SkBackingFit::kApprox, SkBudgeted::kYes);
// TODO: I believe the assignUniqueKeyToProxy below used to instantiate the proxy before
// the draw that used the result was being flushed, so the upload was succeeding. With
// assignUniqueKeyToProxy no longer forcing an instantiation it will have to happen
// explicitly elsewhere.
proxy->instantiate(context->resourceProvider());
auto uploader = skstd::make_unique<GrMaskUploaderPrepareCallback<ClipMaskData>>(
proxy, reducedClip);
GrMaskUploaderPrepareCallback<ClipMaskData>* uploaderRaw = uploader.get();

6
src/gpu/GrSoftwarePathRenderer.cpp
View File

@ -305,6 +305,12 @@ bool GrSoftwarePathRenderer::onDrawPath(const DrawPathArgs& args) {
return false;
}
// TODO: I believe the assignUniqueKeyToProxy below used to instantiate the proxy before
// before the draw that used the result was being flushed, so the upload was succeeding.
// With assignUniqueKeyToProxy no longer forcing an instantiation it will have to happen
// explicitly elsewhere.
proxy->instantiate(fResourceProvider);
auto uploader = skstd::make_unique<GrMaskUploaderPrepareCallback<SoftwarePathData>>(
proxy, *boundsForMask, *args.fViewMatrix, *args.fShape, aa);
GrMaskUploaderPrepareCallback<SoftwarePathData>* uploaderRaw = uploader.get();