Rename GrContext::contextPriv to priv
Mechanical. This makes the priv() accessor the same for all the context types.
Change-Id: I40850eb05a33b8d7cc3eabdd42226d24b2ba58aa
Reviewed-on: https://skia-review.googlesource.com/c/189164
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
diff --git a/src/atlastext/SkAtlasTextTarget.cpp b/src/atlastext/SkAtlasTextTarget.cpp
index 29ea081..68dc6fa 100644
--- a/src/atlastext/SkAtlasTextTarget.cpp
+++ b/src/atlastext/SkAtlasTextTarget.cpp
@@ -87,7 +87,7 @@
: GrTextTarget(width, height, kColorSpaceInfo)
, SkAtlasTextTarget(std::move(context), width, height, handle)
, fGlyphPainter(kProps, kColorSpaceInfo) {
- fOpMemoryPool = fContext->internal().grContext()->contextPriv().refOpMemoryPool();
+ fOpMemoryPool = fContext->internal().grContext()->priv().refOpMemoryPool();
}
~SkInternalAtlasTextTarget() override {
@@ -155,7 +155,7 @@
SkSurfaceProps props(SkSurfaceProps::kUseDistanceFieldFonts_Flag, kUnknown_SkPixelGeometry);
auto* grContext = this->context()->internal().grContext();
- auto atlasTextContext = grContext->contextPriv().drawingManager()->getTextContext();
+ auto atlasTextContext = grContext->priv().drawingManager()->getTextContext();
SkGlyphRunBuilder builder;
builder.drawGlyphsWithPositions(paint, font.makeFont(),
SkSpan<const SkGlyphID>{glyphs, SkTo<size_t>(glyphCnt)},
@@ -173,7 +173,7 @@
if (op->maskType() != GrAtlasTextOp::kGrayscaleDistanceField_MaskType) {
return;
}
- const GrCaps& caps = *this->context()->internal().grContext()->contextPriv().caps();
+ const GrCaps& caps = *this->context()->internal().grContext()->priv().caps();
op->finalizeForTextTarget(fColor, caps);
int n = SkTMin(kMaxBatchLookBack, fOps.count());
for (int i = 0; i < n; ++i) {
@@ -219,9 +219,9 @@
FlushInfo flushInfo;
SkExclusiveStrikePtr autoGlyphCache;
auto& context = target->context()->internal();
- auto glyphCache = context.grContext()->contextPriv().getGlyphCache();
- auto atlasManager = context.grContext()->contextPriv().getAtlasManager();
- auto resourceProvider = context.grContext()->contextPriv().resourceProvider();
+ auto glyphCache = context.grContext()->priv().getGlyphCache();
+ auto atlasManager = context.grContext()->priv().getAtlasManager();
+ auto resourceProvider = context.grContext()->priv().resourceProvider();
unsigned int numProxies;
if (!atlasManager->getProxies(kA8_GrMaskFormat, &numProxies)) {
diff --git a/src/atlastext/SkInternalAtlasTextContext.cpp b/src/atlastext/SkInternalAtlasTextContext.cpp
index ec93dd7..ba2924e 100644
--- a/src/atlastext/SkInternalAtlasTextContext.cpp
+++ b/src/atlastext/SkInternalAtlasTextContext.cpp
@@ -38,7 +38,7 @@
SkInternalAtlasTextContext::~SkInternalAtlasTextContext() {
if (fDistanceFieldAtlas.fProxy) {
#ifdef SK_DEBUG
- auto atlasManager = fGrContext->contextPriv().getAtlasManager();
+ auto atlasManager = fGrContext->priv().getAtlasManager();
if (atlasManager) {
unsigned int numProxies;
atlasManager->getProxies(kA8_GrMaskFormat, &numProxies);
@@ -50,11 +50,11 @@
}
GrStrikeCache* SkInternalAtlasTextContext::glyphCache() {
- return fGrContext->contextPriv().getGlyphCache();
+ return fGrContext->priv().getGlyphCache();
}
GrTextBlobCache* SkInternalAtlasTextContext::textBlobCache() {
- return fGrContext->contextPriv().getTextBlobCache();
+ return fGrContext->priv().getTextBlobCache();
}
GrDeferredUploadToken SkInternalAtlasTextContext::addInlineUpload(
@@ -88,7 +88,7 @@
}
void SkInternalAtlasTextContext::flush() {
- auto* atlasManager = fGrContext->contextPriv().getAtlasManager();
+ auto* atlasManager = fGrContext->priv().getAtlasManager();
if (!fDistanceFieldAtlas.fProxy) {
unsigned int numProxies;
fDistanceFieldAtlas.fProxy = atlasManager->getProxies(kA8_GrMaskFormat, &numProxies)->get();
diff --git a/src/core/SkBlurMF.cpp b/src/core/SkBlurMF.cpp
index 9ea0289..b3a1a6a 100644
--- a/src/core/SkBlurMF.cpp
+++ b/src/core/SkBlurMF.cpp
@@ -757,7 +757,7 @@
return false;
}
- GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider();
+ GrProxyProvider* proxyProvider = context->priv().proxyProvider();
std::unique_ptr<GrFragmentProcessor> fp;
if (devRRect.isRect() || SkRRectPriv::IsCircle(devRRect)) {
@@ -765,7 +765,7 @@
SkScalar pad = 3.0f * xformedSigma;
const SkRect dstCoverageRect = devRRect.rect().makeOutset(pad, pad);
- fp = GrRectBlurEffect::Make(proxyProvider, *context->contextPriv().caps()->shaderCaps(),
+ fp = GrRectBlurEffect::Make(proxyProvider, *context->priv().caps()->shaderCaps(),
dstCoverageRect, xformedSigma);
} else {
fp = GrCircleBlurFragmentProcessor::Make(proxyProvider, devRRect.rect(), xformedSigma);
diff --git a/src/core/SkDeferredDisplayListRecorder.cpp b/src/core/SkDeferredDisplayListRecorder.cpp
index 3beaa54..1d7c970 100644
--- a/src/core/SkDeferredDisplayListRecorder.cpp
+++ b/src/core/SkDeferredDisplayListRecorder.cpp
@@ -79,7 +79,7 @@
SkDeferredDisplayListRecorder::~SkDeferredDisplayListRecorder() {
if (fContext) {
- auto proxyProvider = fContext->contextPriv().proxyProvider();
+ auto proxyProvider = fContext->priv().proxyProvider();
// This allows the uniquely keyed proxies to keep their keys but removes their back
// pointer to the about-to-be-deleted proxy provider. The proxies will use their
@@ -107,7 +107,7 @@
fLazyProxyData = sk_sp<SkDeferredDisplayList::LazyProxyData>(
new SkDeferredDisplayList::LazyProxyData);
- auto proxyProvider = fContext->contextPriv().proxyProvider();
+ auto proxyProvider = fContext->priv().proxyProvider();
bool usesGLFBO0 = fCharacterization.usesGLFBO0();
if (usesGLFBO0) {
@@ -131,7 +131,7 @@
// DDL is being replayed into.
GrInternalSurfaceFlags surfaceFlags = GrInternalSurfaceFlags::kNone;
- if (fContext->contextPriv().caps()->usesMixedSamples() && desc.fSampleCnt > 1 && !usesGLFBO0) {
+ if (fContext->priv().caps()->usesMixedSamples() && desc.fSampleCnt > 1 && !usesGLFBO0) {
// In GL, FBO 0 never supports mixed samples
surfaceFlags |= GrInternalSurfaceFlags::kMixedSampled;
}
@@ -145,7 +145,7 @@
optionalTextureInfo = &kTextureInfo;
}
- const GrBackendFormat format = fContext->contextPriv().caps()->getBackendFormatFromColorType(
+ const GrBackendFormat format = fContext->priv().caps()->getBackendFormatFromColorType(
fCharacterization.colorType());
sk_sp<GrRenderTargetProxy> proxy = proxyProvider->createLazyRenderTargetProxy(
@@ -167,7 +167,7 @@
SkBackingFit::kExact,
SkBudgeted::kYes);
- sk_sp<GrSurfaceContext> c = fContext->contextPriv().makeWrappedSurfaceContext(
+ sk_sp<GrSurfaceContext> c = fContext->priv().makeWrappedSurfaceContext(
std::move(proxy),
fCharacterization.refColorSpace(),
&fCharacterization.surfaceProps());
@@ -202,7 +202,7 @@
auto ddl = std::unique_ptr<SkDeferredDisplayList>(
new SkDeferredDisplayList(fCharacterization, std::move(fLazyProxyData)));
- fContext->contextPriv().moveOpListsToDDL(ddl.get());
+ fContext->priv().moveOpListsToDDL(ddl.get());
// We want a new lazy proxy target for each recorded DDL so force the (lazy proxy-backed)
// SkSurface to be regenerated for each DDL.
diff --git a/src/core/SkGlyphRunPainter.cpp b/src/core/SkGlyphRunPainter.cpp
index 4add012..a0af48c 100644
--- a/src/core/SkGlyphRunPainter.cpp
+++ b/src/core/SkGlyphRunPainter.cpp
@@ -528,8 +528,8 @@
(mf && !as_MFB(mf)->asABlur(&blurRec)));
SkScalerContextFlags scalerContextFlags = ComputeScalerContextFlags(target->colorSpaceInfo());
- auto glyphCache = context->contextPriv().getGlyphCache();
- GrTextBlobCache* textBlobCache = context->contextPriv().getTextBlobCache();
+ auto glyphCache = context->priv().getGlyphCache();
+ GrTextBlobCache* textBlobCache = context->priv().getTextBlobCache();
sk_sp<GrTextBlob> cacheBlob;
GrTextBlob::Key key;
@@ -564,7 +564,7 @@
textBlobCache->remove(cacheBlob.get());
cacheBlob = textBlobCache->makeCachedBlob(glyphRunList, key, blurRec, listPaint, color);
cacheBlob->generateFromGlyphRunList(
- glyphCache, *context->contextPriv().caps()->shaderCaps(), fOptions,
+ glyphCache, *context->priv().caps()->shaderCaps(), fOptions,
listPaint, scalerContextFlags, viewMatrix, props,
glyphRunList, target->glyphPainter());
} else {
@@ -574,7 +574,7 @@
sk_sp<GrTextBlob> sanityBlob(textBlobCache->makeBlob(glyphRunList, color));
sanityBlob->setupKey(key, blurRec, listPaint);
cacheBlob->generateFromGlyphRunList(
- glyphCache, *context->contextPriv().caps()->shaderCaps(), fOptions,
+ glyphCache, *context->priv().caps()->shaderCaps(), fOptions,
listPaint, scalerContextFlags, viewMatrix, props, glyphRunList,
target->glyphPainter());
GrTextBlob::AssertEqual(*sanityBlob, *cacheBlob);
@@ -587,7 +587,7 @@
cacheBlob = textBlobCache->makeBlob(glyphRunList, color);
}
cacheBlob->generateFromGlyphRunList(
- glyphCache, *context->contextPriv().caps()->shaderCaps(), fOptions, listPaint,
+ glyphCache, *context->priv().caps()->shaderCaps(), fOptions, listPaint,
scalerContextFlags, viewMatrix, props, glyphRunList,
target->glyphPainter());
}
@@ -882,7 +882,7 @@
const char* text,
int x,
int y) {
- auto glyphCache = context->contextPriv().getGlyphCache();
+ auto glyphCache = context->priv().getGlyphCache();
static SkSurfaceProps surfaceProps(SkSurfaceProps::kLegacyFontHost_InitType);
@@ -898,12 +898,12 @@
auto glyphRunList = builder.useGlyphRunList();
sk_sp<GrTextBlob> blob;
if (!glyphRunList.empty()) {
- blob = context->contextPriv().getTextBlobCache()->makeBlob(glyphRunList, color);
+ blob = context->priv().getTextBlobCache()->makeBlob(glyphRunList, color);
// Use the text and textLen below, because we don't want to mess with the paint.
SkScalerContextFlags scalerContextFlags =
ComputeScalerContextFlags(rtc->colorSpaceInfo());
blob->generateFromGlyphRunList(
- glyphCache, *context->contextPriv().caps()->shaderCaps(), textContext->fOptions,
+ glyphCache, *context->priv().caps()->shaderCaps(), textContext->fOptions,
skPaint, scalerContextFlags, viewMatrix, surfaceProps,
glyphRunList, rtc->textTarget()->glyphPainter());
}
diff --git a/src/core/SkGpuBlurUtils.cpp b/src/core/SkGpuBlurUtils.cpp
index 54f1bc7..7c79d72 100644
--- a/src/core/SkGpuBlurUtils.cpp
+++ b/src/core/SkGpuBlurUtils.cpp
@@ -123,7 +123,7 @@
}
sk_sp<GrRenderTargetContext> renderTargetContext;
- renderTargetContext = context->contextPriv().makeDeferredRenderTargetContext(
+ renderTargetContext = context->priv().makeDeferredRenderTargetContext(
format,
dstFit, dstII.width(), dstII.height(),
config, dstII.refColorSpace(),
@@ -171,7 +171,7 @@
}
sk_sp<GrRenderTargetContext> dstRenderTargetContext;
- dstRenderTargetContext = context->contextPriv().makeDeferredRenderTargetContext(
+ dstRenderTargetContext = context->priv().makeDeferredRenderTargetContext(
format,
fit, srcRect.width(),
srcRect.height(),
@@ -297,7 +297,7 @@
shrink_irect_by_2(&dstRect, i < scaleFactorX, i < scaleFactorY);
// We know this will not be the final draw so we are free to make it an approx match.
- dstRenderTargetContext = context->contextPriv().makeDeferredRenderTargetContext(
+ dstRenderTargetContext = context->priv().makeDeferredRenderTargetContext(
format,
SkBackingFit::kApprox,
dstRect.fRight,
@@ -406,7 +406,7 @@
}
sk_sp<GrRenderTargetContext> dstRenderTargetContext =
- context->contextPriv().makeDeferredRenderTargetContext(format,
+ context->priv().makeDeferredRenderTargetContext(format,
fit, dstII.width(), dstII.height(),
config, dstII.refColorSpace(),
1, GrMipMapped::kNo,
@@ -472,7 +472,7 @@
int scaleFactorX, radiusX;
int scaleFactorY, radiusY;
- int maxTextureSize = context->contextPriv().caps()->maxTextureSize();
+ int maxTextureSize = context->priv().caps()->maxTextureSize();
sigmaX = adjust_sigma(sigmaX, maxTextureSize, &scaleFactorX, &radiusX);
sigmaY = adjust_sigma(sigmaY, maxTextureSize, &scaleFactorY, &radiusY);
SkASSERT(sigmaX || sigmaY);
diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp
index 4de7124..d6418f9 100644
--- a/src/core/SkImageFilter.cpp
+++ b/src/core/SkImageFilter.cpp
@@ -249,10 +249,10 @@
sk_sp<SkColorSpace> colorSpace = sk_ref_sp(outputProperties.colorSpace());
GrPixelConfig config = SkColorType2GrPixelConfig(outputProperties.colorType());
GrBackendFormat format =
- context->contextPriv().caps()->getBackendFormatFromColorType(
+ context->priv().caps()->getBackendFormatFromColorType(
outputProperties.colorType());
sk_sp<GrRenderTargetContext> renderTargetContext(
- context->contextPriv().makeDeferredRenderTargetContext(
+ context->priv().makeDeferredRenderTargetContext(
format, SkBackingFit::kApprox, bounds.width(), bounds.height(),
config, std::move(colorSpace)));
if (!renderTargetContext) {
diff --git a/src/core/SkSpecialImage.cpp b/src/core/SkSpecialImage.cpp
index a2032c6..e7a4143 100644
--- a/src/core/SkSpecialImage.cpp
+++ b/src/core/SkSpecialImage.cpp
@@ -88,7 +88,7 @@
return curContext == context ? sk_sp<SkSpecialImage>(SkRef(this)) : nullptr;
}
- auto proxyProvider = context->contextPriv().proxyProvider();
+ auto proxyProvider = context->priv().proxyProvider();
SkBitmap bmp;
// At this point, we are definitely not texture-backed, so we must be raster or generator
// backed. If we remove the special-wrapping-an-image subclass, we may be able to assert that
@@ -192,7 +192,7 @@
#if SK_SUPPORT_GPU
if (sk_sp<GrTextureProxy> proxy = as_IB(image)->asTextureProxyRef()) {
- if (as_IB(image)->contextID() != context->contextPriv().contextID()) {
+ if (as_IB(image)->contextID() != context->priv().contextID()) {
return nullptr;
}
@@ -245,7 +245,7 @@
#if SK_SUPPORT_GPU
sk_sp<GrTextureProxy> onAsTextureProxyRef(GrContext* context) const override {
if (context) {
- return GrMakeCachedBitmapProxy(context->contextPriv().proxyProvider(), fBitmap);
+ return GrMakeCachedBitmapProxy(context->priv().proxyProvider(), fBitmap);
}
return nullptr;
@@ -431,7 +431,7 @@
if (!rec) {
return false;
}
- sk_sp<GrSurfaceContext> sContext = fContext->contextPriv().makeWrappedSurfaceContext(
+ sk_sp<GrSurfaceContext> sContext = fContext->priv().makeWrappedSurfaceContext(
fTextureProxy, fColorSpace);
if (!sContext) {
return false;
@@ -459,7 +459,7 @@
}
GrBackendFormat format =
- fContext->contextPriv().caps()->getBackendFormatFromColorType(outProps.colorType());
+ fContext->priv().caps()->getBackendFormatFromColorType(outProps.colorType());
return SkSpecialSurface::MakeRenderTarget(
fContext, format, size.width(), size.height(),
diff --git a/src/core/SkSpecialSurface.cpp b/src/core/SkSpecialSurface.cpp
index a1d76f1..7f6a04a 100644
--- a/src/core/SkSpecialSurface.cpp
+++ b/src/core/SkSpecialSurface.cpp
@@ -175,7 +175,7 @@
}
sk_sp<GrRenderTargetContext> renderTargetContext(
- context->contextPriv().makeDeferredRenderTargetContext(
+ context->priv().makeDeferredRenderTargetContext(
format, SkBackingFit::kApprox, width, height, config, std::move(colorSpace), 1,
GrMipMapped::kNo, kBottomLeft_GrSurfaceOrigin, props));
if (!renderTargetContext) {
diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp
index 2aa71f9..c8ebb1e 100644
--- a/src/effects/SkTableColorFilter.cpp
+++ b/src/effects/SkTableColorFilter.cpp
@@ -398,7 +398,7 @@
return nullptr;
}
- sk_sp<GrTextureProxy> proxy = GrMakeCachedImageProxy(context->contextPriv().proxyProvider(),
+ sk_sp<GrTextureProxy> proxy = GrMakeCachedImageProxy(context->priv().proxyProvider(),
std::move(srcImage));
if (!proxy) {
return nullptr;
diff --git a/src/effects/imagefilters/SkAlphaThresholdFilter.cpp b/src/effects/imagefilters/SkAlphaThresholdFilter.cpp
index 7056e4d..39b92f5 100644
--- a/src/effects/imagefilters/SkAlphaThresholdFilter.cpp
+++ b/src/effects/imagefilters/SkAlphaThresholdFilter.cpp
@@ -106,9 +106,9 @@
const SkMatrix& inMatrix,
const SkIRect& bounds) const {
GrBackendFormat format =
- context->contextPriv().caps()->getBackendFormatFromColorType(kAlpha_8_SkColorType);
+ context->priv().caps()->getBackendFormatFromColorType(kAlpha_8_SkColorType);
sk_sp<GrRenderTargetContext> rtContext(
- context->contextPriv().makeDeferredRenderTargetContextWithFallback(
+ context->priv().makeDeferredRenderTargetContextWithFallback(
format, SkBackingFit::kApprox, bounds.width(), bounds.height(), kAlpha_8_GrPixelConfig,
nullptr));
if (!rtContext) {
diff --git a/src/effects/imagefilters/SkArithmeticImageFilter.cpp b/src/effects/imagefilters/SkArithmeticImageFilter.cpp
index 8e8dabf..f5603e4 100644
--- a/src/effects/imagefilters/SkArithmeticImageFilter.cpp
+++ b/src/effects/imagefilters/SkArithmeticImageFilter.cpp
@@ -362,10 +362,10 @@
SkColorType colorType = outputProperties.colorType();
GrBackendFormat format =
- context->contextPriv().caps()->getBackendFormatFromColorType(colorType);
+ context->priv().caps()->getBackendFormatFromColorType(colorType);
sk_sp<GrRenderTargetContext> renderTargetContext(
- context->contextPriv().makeDeferredRenderTargetContext(
+ context->priv().makeDeferredRenderTargetContext(
format, SkBackingFit::kApprox, bounds.width(), bounds.height(),
SkColorType2GrPixelConfig(colorType),
sk_ref_sp(outputProperties.colorSpace())));
diff --git a/src/effects/imagefilters/SkDisplacementMapEffect.cpp b/src/effects/imagefilters/SkDisplacementMapEffect.cpp
index a29c38c..3c48d75 100644
--- a/src/effects/imagefilters/SkDisplacementMapEffect.cpp
+++ b/src/effects/imagefilters/SkDisplacementMapEffect.cpp
@@ -301,10 +301,10 @@
SkColorType colorType = ctx.outputProperties().colorType();
GrPixelConfig config = SkColorType2GrPixelConfig(colorType);
GrBackendFormat format =
- context->contextPriv().caps()->getBackendFormatFromColorType(colorType);
+ context->priv().caps()->getBackendFormatFromColorType(colorType);
sk_sp<GrRenderTargetContext> renderTargetContext(
- context->contextPriv().makeDeferredRenderTargetContext(
+ context->priv().makeDeferredRenderTargetContext(
format, SkBackingFit::kApprox, bounds.width(), bounds.height(), config,
sk_ref_sp(colorSpace)));
if (!renderTargetContext) {
diff --git a/src/effects/imagefilters/SkLightingImageFilter.cpp b/src/effects/imagefilters/SkLightingImageFilter.cpp
index 8e2357e..2b640d5 100644
--- a/src/effects/imagefilters/SkLightingImageFilter.cpp
+++ b/src/effects/imagefilters/SkLightingImageFilter.cpp
@@ -466,10 +466,10 @@
SkColorType colorType = outputProperties.colorType();
GrBackendFormat format =
- context->contextPriv().caps()->getBackendFormatFromColorType(colorType);
+ context->priv().caps()->getBackendFormatFromColorType(colorType);
sk_sp<GrRenderTargetContext> renderTargetContext(
- context->contextPriv().makeDeferredRenderTargetContext(
+ context->priv().makeDeferredRenderTargetContext(
format, SkBackingFit::kApprox, offsetBounds.width(),
offsetBounds.height(), SkColorType2GrPixelConfig(colorType),
sk_ref_sp(outputProperties.colorSpace())));
diff --git a/src/effects/imagefilters/SkMorphologyImageFilter.cpp b/src/effects/imagefilters/SkMorphologyImageFilter.cpp
index 6ddc80d..46795fc 100644
--- a/src/effects/imagefilters/SkMorphologyImageFilter.cpp
+++ b/src/effects/imagefilters/SkMorphologyImageFilter.cpp
@@ -472,7 +472,7 @@
sk_sp<SkColorSpace> colorSpace = sk_ref_sp(outputProperties.colorSpace());
SkColorType colorType = outputProperties.colorType();
GrBackendFormat format =
- context->contextPriv().caps()->getBackendFormatFromColorType(colorType);
+ context->priv().caps()->getBackendFormatFromColorType(colorType);
GrPixelConfig config = SkColorType2GrPixelConfig(colorType);
// setup new clip
@@ -485,7 +485,7 @@
if (radius.fWidth > 0) {
sk_sp<GrRenderTargetContext> dstRTContext(
- context->contextPriv().makeDeferredRenderTargetContext(
+ context->priv().makeDeferredRenderTargetContext(
format, SkBackingFit::kApprox, rect.width(), rect.height(), config, colorSpace));
if (!dstRTContext) {
return nullptr;
@@ -504,7 +504,7 @@
}
if (radius.fHeight > 0) {
sk_sp<GrRenderTargetContext> dstRTContext(
- context->contextPriv().makeDeferredRenderTargetContext(
+ context->priv().makeDeferredRenderTargetContext(
format, SkBackingFit::kApprox, rect.width(), rect.height(), config, colorSpace));
if (!dstRTContext) {
return nullptr;
diff --git a/src/effects/imagefilters/SkXfermodeImageFilter.cpp b/src/effects/imagefilters/SkXfermodeImageFilter.cpp
index 62147e3..a9d4ed8 100644
--- a/src/effects/imagefilters/SkXfermodeImageFilter.cpp
+++ b/src/effects/imagefilters/SkXfermodeImageFilter.cpp
@@ -321,10 +321,10 @@
SkColorType colorType = outputProperties.colorType();
GrBackendFormat format =
- context->contextPriv().caps()->getBackendFormatFromColorType(colorType);
+ context->priv().caps()->getBackendFormatFromColorType(colorType);
sk_sp<GrRenderTargetContext> renderTargetContext(
- context->contextPriv().makeDeferredRenderTargetContext(
+ context->priv().makeDeferredRenderTargetContext(
format, SkBackingFit::kApprox, bounds.width(), bounds.height(),
SkColorType2GrPixelConfig(colorType),
sk_ref_sp(outputProperties.colorSpace())));
diff --git a/src/gpu/GrAHardwareBufferImageGenerator.cpp b/src/gpu/GrAHardwareBufferImageGenerator.cpp
index c90e090..3c52c40 100644
--- a/src/gpu/GrAHardwareBufferImageGenerator.cpp
+++ b/src/gpu/GrAHardwareBufferImageGenerator.cpp
@@ -159,7 +159,7 @@
bool isProtectedContent,
const GrBackendFormat& backendFormat) {
SkASSERT(context->backend() == GrBackendApi::kVulkan);
- GrVkGpu* gpu = static_cast<GrVkGpu*>(context->contextPriv().getGpu());
+ GrVkGpu* gpu = static_cast<GrVkGpu*>(context->priv().getGpu());
VkPhysicalDevice physicalDevice = gpu->physicalDevice();
VkDevice device = gpu->device();
@@ -485,7 +485,7 @@
case AHARDWAREBUFFER_FORMAT_R8G8B8_UNORM:
return GrBackendFormat::MakeVk(VK_FORMAT_R8G8B8_UNORM);
default: {
- GrVkGpu* gpu = static_cast<GrVkGpu*>(context->contextPriv().getGpu());
+ GrVkGpu* gpu = static_cast<GrVkGpu*>(context->priv().getGpu());
SkASSERT(gpu);
VkDevice device = gpu->device();
@@ -544,7 +544,7 @@
GrBackendFormat backendFormat = get_backend_format(context, fHardwareBuffer,
context->backend(),
fBufferFormat);
- GrPixelConfig pixelConfig = context->contextPriv().caps()->getConfigFromBackendFormat(
+ GrPixelConfig pixelConfig = context->priv().caps()->getConfigFromBackendFormat(
backendFormat, this->getInfo().colorType());
if (pixelConfig == kUnknown_GrPixelConfig) {
@@ -570,7 +570,7 @@
}
}
- auto proxyProvider = context->contextPriv().proxyProvider();
+ auto proxyProvider = context->priv().proxyProvider();
AHardwareBuffer* hardwareBuffer = fHardwareBuffer;
AHardwareBuffer_acquire(hardwareBuffer);
diff --git a/src/gpu/GrBackendTextureImageGenerator.cpp b/src/gpu/GrBackendTextureImageGenerator.cpp
index 7926956..b968e141 100644
--- a/src/gpu/GrBackendTextureImageGenerator.cpp
+++ b/src/gpu/GrBackendTextureImageGenerator.cpp
@@ -40,7 +40,7 @@
// Attach our texture to this context's resource cache. This ensures that deletion will happen
// in the correct thread/context. This adds the only ref to the texture that will persist from
// this point. That ref will be released when the generator's RefHelper is freed.
- context->contextPriv().getResourceCache()->insertCrossContextGpuResource(texture.get());
+ context->priv().getResourceCache()->insertCrossContextGpuResource(texture.get());
GrBackendTexture backendTexture = texture->getBackendTexture();
GrBackendFormat backendFormat = backendTexture.getBackendFormat();
@@ -48,7 +48,7 @@
return nullptr;
}
backendTexture.fConfig =
- context->contextPriv().caps()->getConfigFromBackendFormat(backendFormat, colorType);
+ context->priv().caps()->getConfigFromBackendFormat(backendFormat, colorType);
if (backendTexture.fConfig == kUnknown_GrPixelConfig) {
return nullptr;
}
@@ -56,7 +56,7 @@
SkImageInfo info = SkImageInfo::Make(texture->width(), texture->height(), colorType, alphaType,
std::move(colorSpace));
return std::unique_ptr<SkImageGenerator>(new GrBackendTextureImageGenerator(
- info, texture.get(), origin, context->contextPriv().contextID(),
+ info, texture.get(), origin, context->priv().contextID(),
std::move(semaphore), backendTexture));
}
@@ -100,12 +100,12 @@
return nullptr;
}
- auto proxyProvider = context->contextPriv().proxyProvider();
+ auto proxyProvider = context->priv().proxyProvider();
fBorrowingMutex.acquire();
sk_sp<GrReleaseProcHelper> releaseProcHelper;
if (SK_InvalidGenID != fRefHelper->fBorrowingContextID) {
- if (fRefHelper->fBorrowingContextID != context->contextPriv().contextID()) {
+ if (fRefHelper->fBorrowingContextID != context->priv().contextID()) {
fBorrowingMutex.release();
return nullptr;
} else {
@@ -122,10 +122,10 @@
fRefHelper));
fRefHelper->fBorrowingContextReleaseProc = releaseProcHelper.get();
}
- fRefHelper->fBorrowingContextID = context->contextPriv().contextID();
+ fRefHelper->fBorrowingContextID = context->priv().contextID();
fBorrowingMutex.release();
- SkASSERT(fRefHelper->fBorrowingContextID == context->contextPriv().contextID());
+ SkASSERT(fRefHelper->fBorrowingContextID == context->priv().contextID());
GrSurfaceDesc desc;
desc.fWidth = fBackendTexture.width();
@@ -206,7 +206,7 @@
}
sk_sp<GrRenderTargetContext> rtContext(
- context->contextPriv().makeDeferredRenderTargetContext(
+ context->priv().makeDeferredRenderTargetContext(
format, SkBackingFit::kExact, info.width(), info.height(),
proxy->config(), nullptr, 1, mipMapped, proxy->origin(), nullptr,
SkBudgeted::kYes));
diff --git a/src/gpu/GrBitmapTextureMaker.cpp b/src/gpu/GrBitmapTextureMaker.cpp
index 291d6b1..95f1c84 100644
--- a/src/gpu/GrBitmapTextureMaker.cpp
+++ b/src/gpu/GrBitmapTextureMaker.cpp
@@ -36,7 +36,7 @@
return nullptr;
}
- GrProxyProvider* proxyProvider = this->context()->contextPriv().proxyProvider();
+ GrProxyProvider* proxyProvider = this->context()->priv().proxyProvider();
sk_sp<GrTextureProxy> proxy;
if (fOriginalKey.isValid()) {
diff --git a/src/gpu/GrBlurUtils.cpp b/src/gpu/GrBlurUtils.cpp
index 331e415..816801a 100644
--- a/src/gpu/GrBlurUtils.cpp
+++ b/src/gpu/GrBlurUtils.cpp
@@ -70,7 +70,7 @@
SkASSERT(filter);
SkASSERT(!shape.style().applies());
- auto proxyProvider = context->contextPriv().proxyProvider();
+ auto proxyProvider = context->priv().proxyProvider();
sk_sp<GrTextureProxy> filteredMask;
@@ -176,9 +176,9 @@
const GrShape& shape,
int sampleCnt) {
GrBackendFormat format =
- context->contextPriv().caps()->getBackendFormatFromColorType(kAlpha_8_SkColorType);
+ context->priv().caps()->getBackendFormatFromColorType(kAlpha_8_SkColorType);
sk_sp<GrRenderTargetContext> rtContext(
- context->contextPriv().makeDeferredRenderTargetContextWithFallback(
+ context->priv().makeDeferredRenderTargetContextWithFallback(
format, SkBackingFit::kApprox, maskRect.width(), maskRect.height(),
kAlpha_8_GrPixelConfig, nullptr, sampleCnt, GrMipMapped::kNo,
kTopLeft_GrSurfaceOrigin));
@@ -388,7 +388,7 @@
sk_sp<GrTextureProxy> filteredMask;
- GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider();
+ GrProxyProvider* proxyProvider = context->priv().proxyProvider();
if (maskKey.isValid()) {
// TODO: this cache look up is duplicated in sw_draw_with_mask_filter for raster
diff --git a/src/gpu/GrBufferAllocPool.cpp b/src/gpu/GrBufferAllocPool.cpp
index bc91d30..67898c4 100644
--- a/src/gpu/GrBufferAllocPool.cpp
+++ b/src/gpu/GrBufferAllocPool.cpp
@@ -366,7 +366,7 @@
}
sk_sp<GrBuffer> GrBufferAllocPool::getBuffer(size_t size) {
- auto resourceProvider = fGpu->getContext()->contextPriv().resourceProvider();
+ auto resourceProvider = fGpu->getContext()->priv().resourceProvider();
return resourceProvider->createBuffer(size, fBufferType, kDynamic_GrAccessPattern,
GrResourceProvider::Flags::kNone);
diff --git a/src/gpu/GrClipStackClip.cpp b/src/gpu/GrClipStackClip.cpp
index 7aadaa4..c2209d9 100644
--- a/src/gpu/GrClipStackClip.cpp
+++ b/src/gpu/GrClipStackClip.cpp
@@ -119,21 +119,21 @@
GrShape shape(path, GrStyle::SimpleFill());
GrPathRenderer::CanDrawPathArgs canDrawArgs;
- canDrawArgs.fCaps = context->contextPriv().caps();
+ canDrawArgs.fCaps = context->priv().caps();
canDrawArgs.fClipConservativeBounds = &scissorRect;
canDrawArgs.fViewMatrix = &viewMatrix;
canDrawArgs.fShape = &shape;
canDrawArgs.fAAType = GrChooseAAType(GrAA(element->isAA()),
renderTargetContext->fsaaType(),
GrAllowMixedSamples::kYes,
- *context->contextPriv().caps());
+ *context->priv().caps());
SkASSERT(!renderTargetContext->wrapsVkSecondaryCB());
canDrawArgs.fTargetIsWrappedVkSecondaryCB = false;
canDrawArgs.fHasUserStencilSettings = hasUserStencilSettings;
// the 'false' parameter disallows use of the SW path renderer
GrPathRenderer* pr =
- context->contextPriv().drawingManager()->getPathRenderer(canDrawArgs, false, type);
+ context->priv().drawingManager()->getPathRenderer(canDrawArgs, false, type);
if (prOut) {
*prOut = pr;
}
@@ -160,7 +160,7 @@
// If we're avoiding stencils, always use SW. This includes drawing into a wrapped vulkan
// secondary command buffer which can't handle stencils.
- if (context->contextPriv().caps()->avoidStencilBuffers() ||
+ if (context->priv().caps()->avoidStencilBuffers() ||
renderTargetContext->wrapsVkSecondaryCB()) {
return true;
}
@@ -202,7 +202,7 @@
}
int maxWindowRectangles = renderTargetContext->priv().maxWindowRectangles();
- int maxAnalyticFPs = context->contextPriv().caps()->maxClipAnalyticFPs();
+ int maxAnalyticFPs = context->priv().caps()->maxClipAnalyticFPs();
if (GrFSAAType::kNone != renderTargetContext->fsaaType()) {
// With mixed samples (non-msaa color buffer), any coverage info is lost from color once it
// hits the color buffer anyway, so we may as well use coverage AA if nothing else in the
@@ -211,11 +211,11 @@
maxAnalyticFPs = 0;
}
// We disable MSAA when avoiding stencil.
- SkASSERT(!context->contextPriv().caps()->avoidStencilBuffers());
+ SkASSERT(!context->priv().caps()->avoidStencilBuffers());
}
- auto* ccpr = context->contextPriv().drawingManager()->getCoverageCountingPathRenderer();
+ auto* ccpr = context->priv().drawingManager()->getCoverageCountingPathRenderer();
- GrReducedClip reducedClip(*fStack, devBounds, context->contextPriv().caps(),
+ GrReducedClip reducedClip(*fStack, devBounds, context->priv().caps(),
maxWindowRectangles, maxAnalyticFPs, ccpr ? maxAnalyticFPs : 0);
if (InitialState::kAllOut == reducedClip.initialState() &&
reducedClip.maskElements().isEmpty()) {
@@ -262,7 +262,7 @@
// If the stencil buffer is multisampled we can use it to do everything.
if ((GrFSAAType::kNone == renderTargetContext->fsaaType() && reducedClip.maskRequiresAA()) ||
- context->contextPriv().caps()->avoidStencilBuffers() ||
+ context->priv().caps()->avoidStencilBuffers() ||
renderTargetContext->wrapsVkSecondaryCB()) {
sk_sp<GrTextureProxy> result;
if (UseSWOnlyPath(context, hasUserStencilSettings, renderTargetContext, reducedClip)) {
@@ -282,7 +282,7 @@
// If alpha or software clip mask creation fails, fall through to the stencil code paths,
// unless stencils are disallowed.
- if (context->contextPriv().caps()->avoidStencilBuffers() ||
+ if (context->priv().caps()->avoidStencilBuffers() ||
renderTargetContext->wrapsVkSecondaryCB()) {
SkDebugf("WARNING: Clip mask requires stencil, but stencil unavailable. "
"Clip will be ignored.\n");
@@ -325,7 +325,7 @@
static void add_invalidate_on_pop_message(GrContext* context,
const SkClipStack& stack, uint32_t clipGenID,
const GrUniqueKey& clipMaskKey) {
- GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider();
+ GrProxyProvider* proxyProvider = context->priv().proxyProvider();
SkClipStack::Iter iter(stack, SkClipStack::Iter::kTop_IterStart);
while (const Element* element = iter.prev()) {
@@ -339,7 +339,7 @@
sk_sp<GrTextureProxy> GrClipStackClip::createAlphaClipMask(GrContext* context,
const GrReducedClip& reducedClip) const {
- GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider();
+ GrProxyProvider* proxyProvider = context->priv().proxyProvider();
GrUniqueKey key;
create_clip_mask_key(reducedClip.maskGenID(), reducedClip.scissor(),
reducedClip.numAnalyticFPs(), &key);
@@ -351,9 +351,9 @@
}
GrBackendFormat format =
- context->contextPriv().caps()->getBackendFormatFromColorType(kAlpha_8_SkColorType);
+ context->priv().caps()->getBackendFormatFromColorType(kAlpha_8_SkColorType);
sk_sp<GrRenderTargetContext> rtc(
- context->contextPriv().makeDeferredRenderTargetContextWithFallback(
+ context->priv().makeDeferredRenderTargetContextWithFallback(
format,
SkBackingFit::kApprox,
reducedClip.width(),
@@ -463,7 +463,7 @@
create_clip_mask_key(reducedClip.maskGenID(), reducedClip.scissor(),
reducedClip.numAnalyticFPs(), &key);
- GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider();
+ GrProxyProvider* proxyProvider = context->priv().proxyProvider();
sk_sp<GrTextureProxy> proxy(proxyProvider->findOrCreateProxyByUniqueKey(
key, kTopLeft_GrSurfaceOrigin));
@@ -475,7 +475,7 @@
// left corner of the resulting rect to the top left of the texture.
SkIRect maskSpaceIBounds = SkIRect::MakeWH(reducedClip.width(), reducedClip.height());
- SkTaskGroup* taskGroup = context->contextPriv().getTaskGroup();
+ SkTaskGroup* taskGroup = context->priv().getTaskGroup();
if (taskGroup && renderTargetContext) {
// Create our texture proxy
GrSurfaceDesc desc;
@@ -484,7 +484,7 @@
desc.fConfig = kAlpha_8_GrPixelConfig;
GrBackendFormat format =
- context->contextPriv().caps()->getBackendFormatFromColorType(kAlpha_8_SkColorType);
+ context->priv().caps()->getBackendFormatFromColorType(kAlpha_8_SkColorType);
// MDB TODO: We're going to fill this proxy with an ASAP upload (which is out of order wrt
// to ops), so it can't have any pending IO.
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 8410b40..382b08c 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -426,7 +426,7 @@
// For canvas2D putImageData performance we have a special code path for unpremul RGBA_8888 srcs
// that are premultiplied on the GPU. This is kept as narrow as possible for now.
bool canvas2DFastPath =
- !fContext->contextPriv().caps()->avoidWritePixelsFastPath() &&
+ !fContext->priv().caps()->avoidWritePixelsFastPath() &&
premul &&
!dst->colorSpaceInfo().colorSpace() &&
(srcColorType == GrColorType::kRGBA_8888 || srcColorType == GrColorType::kBGRA_8888) &&
@@ -434,7 +434,7 @@
(dstProxy->config() == kRGBA_8888_GrPixelConfig ||
dstProxy->config() == kBGRA_8888_GrPixelConfig) &&
!(pixelOpsFlags & kDontFlush_PixelOpsFlag) &&
- fContext->contextPriv().caps()->isConfigTexturable(kRGBA_8888_GrPixelConfig) &&
+ fContext->priv().caps()->isConfigTexturable(kRGBA_8888_GrPixelConfig) &&
fContext->validPMUPMConversionExists();
const GrCaps* caps = this->caps();
@@ -455,7 +455,7 @@
if (canvas2DFastPath) {
desc.fConfig = kRGBA_8888_GrPixelConfig;
format =
- fContext->contextPriv().caps()->getBackendFormatFromColorType(kRGBA_8888_SkColorType);
+ fContext->priv().caps()->getBackendFormatFromColorType(kRGBA_8888_SkColorType);
} else {
desc.fConfig = dstProxy->config();
format = dstProxy->backendFormat().makeTexture2D();
@@ -511,7 +511,7 @@
return false;
}
- GrColorType allowedColorType = fContext->contextPriv().caps()->supportedWritePixelsColorType(
+ GrColorType allowedColorType = fContext->priv().caps()->supportedWritePixelsColorType(
dstProxy->config(), srcColorType);
convert = convert || (srcColorType != allowedColorType);
@@ -627,10 +627,10 @@
SkToBool(srcProxy->asTextureProxy()) &&
(srcProxy->config() == kRGBA_8888_GrPixelConfig ||
srcProxy->config() == kBGRA_8888_GrPixelConfig) &&
- fContext->contextPriv().caps()->isConfigRenderable(kRGBA_8888_GrPixelConfig) &&
+ fContext->priv().caps()->isConfigRenderable(kRGBA_8888_GrPixelConfig) &&
fContext->validPMUPMConversionExists();
- if (!fContext->contextPriv().caps()->surfaceSupportsReadPixels(srcSurface) ||
+ if (!fContext->priv().caps()->surfaceSupportsReadPixels(srcSurface) ||
canvas2DFastPath) {
GrSurfaceDesc desc;
desc.fFlags = canvas2DFastPath ? kRenderTarget_GrSurfaceFlag : kNone_GrSurfaceFlags;
@@ -703,7 +703,7 @@
top = srcSurface->height() - top - height;
}
- GrColorType allowedColorType = fContext->contextPriv().caps()->supportedReadPixelsColorType(
+ GrColorType allowedColorType = fContext->priv().caps()->supportedReadPixelsColorType(
srcProxy->config(), dstColorType);
convert = convert || (dstColorType != allowedColorType);
@@ -997,7 +997,7 @@
SkBudgeted budgeted) {
GrBackendFormat localFormat = format;
SkASSERT(sampleCnt > 0);
- if (0 == fContext->contextPriv().caps()->getRenderTargetSampleCount(sampleCnt, config)) {
+ if (0 == fContext->priv().caps()->getRenderTargetSampleCount(sampleCnt, config)) {
config = GrPixelConfigFallback(config);
// TODO: First we should be checking the getRenderTargetSampleCount from the GrBackendFormat
// and not GrPixelConfig. Besides that, we should implement the fallback in the caps, but
diff --git a/src/gpu/GrContextPriv.h b/src/gpu/GrContextPriv.h
index 123745e..c3ccb1c 100644
--- a/src/gpu/GrContextPriv.h
+++ b/src/gpu/GrContextPriv.h
@@ -303,9 +303,9 @@
friend class GrContext; // to construct/copy this type.
};
-inline GrContextPriv GrContext::contextPriv() { return GrContextPriv(this); }
+inline GrContextPriv GrContext::priv() { return GrContextPriv(this); }
-inline const GrContextPriv GrContext::contextPriv () const {
+inline const GrContextPriv GrContext::priv() const {
return GrContextPriv(const_cast<GrContext*>(this));
}
diff --git a/src/gpu/GrDirectContext.cpp b/src/gpu/GrDirectContext.cpp
index 47d226c..9fdb3b8 100644
--- a/src/gpu/GrDirectContext.cpp
+++ b/src/gpu/GrDirectContext.cpp
@@ -33,7 +33,7 @@
~GrDirectContext() override {
// this if-test protects against the case where the context is being destroyed
// before having been fully created
- if (this->contextPriv().getGpu()) {
+ if (this->priv().getGpu()) {
this->flush();
}
@@ -80,13 +80,13 @@
allowMultitexturing = GrDrawOpAtlas::AllowMultitexturing::kYes;
}
- GrStrikeCache* glyphCache = this->contextPriv().getGlyphCache();
- GrProxyProvider* proxyProvider = this->contextPriv().proxyProvider();
+ GrStrikeCache* glyphCache = this->priv().getGlyphCache();
+ GrProxyProvider* proxyProvider = this->priv().proxyProvider();
fAtlasManager = new GrAtlasManager(proxyProvider, glyphCache,
this->options().fGlyphCacheTextureMaximumBytes,
allowMultitexturing);
- this->contextPriv().addOnFlushCallbackObject(fAtlasManager);
+ this->priv().addOnFlushCallbackObject(fAtlasManager);
return true;
}
diff --git a/src/gpu/GrDrawOpTest.cpp b/src/gpu/GrDrawOpTest.cpp
index d14e5b5..90c6e59 100644
--- a/src/gpu/GrDrawOpTest.cpp
+++ b/src/gpu/GrDrawOpTest.cpp
@@ -16,7 +16,7 @@
#if GR_TEST_UTILS
const GrUserStencilSettings* GrGetRandomStencil(SkRandom* random, GrContext* context) {
- if (context->contextPriv().caps()->avoidStencilBuffers()) {
+ if (context->priv().caps()->avoidStencilBuffers()) {
return &GrUserStencilSettings::kUnused;
}
static constexpr GrUserStencilSettings kReads(
diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/GrDrawingManager.cpp
index 942daf2..985131e 100644
--- a/src/gpu/GrDrawingManager.cpp
+++ b/src/gpu/GrDrawingManager.cpp
@@ -174,7 +174,7 @@
}
void GrDrawingManager::cleanup() {
- fDAG.cleanup(fContext->contextPriv().caps());
+ fDAG.cleanup(fContext->priv().caps());
fPathRendererChain = nullptr;
fSoftwarePathRenderer = nullptr;
@@ -215,7 +215,7 @@
}
SkDEBUGCODE(this->validate());
- GrGpu* gpu = fContext->contextPriv().getGpu();
+ GrGpu* gpu = fContext->priv().getGpu();
if (!gpu) {
return GrSemaphoresSubmitted::kNo; // Can't flush while DDL recording
}
@@ -225,7 +225,7 @@
// needs to flush mid-draw. In that case, the SkGpuDevice's GrOpLists won't be closed
// but need to be flushed anyway. Closing such GrOpLists here will mean new
// GrOpLists will be created to replace them if the SkGpuDevice(s) write to them again.
- fDAG.closeAll(fContext->contextPriv().caps());
+ fDAG.closeAll(fContext->priv().caps());
fActiveOpList = nullptr;
fDAG.prepForFlush();
@@ -235,7 +235,7 @@
fIndexBufferSpace.reset(new char[GrBufferAllocPool::kDefaultBufferSize]());
}
- GrOpFlushState flushState(gpu, fContext->contextPriv().resourceProvider(), &fTokenTracker,
+ GrOpFlushState flushState(gpu, fContext->priv().resourceProvider(), &fTokenTracker,
fVertexBufferSpace.get(), fIndexBufferSpace.get());
GrOnFlushResourceProvider onFlushProvider(this);
@@ -264,7 +264,7 @@
SkASSERT(GrSurfaceProxy::LazyState::kNot == p->lazyInstantiationState());
});
#endif
- onFlushOpList->makeClosed(*fContext->contextPriv().caps());
+ onFlushOpList->makeClosed(*fContext->priv().caps());
onFlushOpList->prepare(&flushState);
fOnFlushCBOpLists.push_back(std::move(onFlushOpList));
}
@@ -283,7 +283,7 @@
bool flushed = false;
{
- GrResourceAllocator alloc(fContext->contextPriv().resourceProvider(),
+ GrResourceAllocator alloc(fContext->priv().resourceProvider(),
flushState.deinstantiateProxyTracker());
for (int i = 0; i < fDAG.numOpLists(); ++i) {
if (fDAG.opList(i)) {
@@ -328,7 +328,7 @@
// When we move to partial flushes this assert will no longer be valid.
// In DDL mode this check is somewhat superfluous since the memory for most of the ops/opLists
// will be stored in the DDL's GrOpMemoryPools.
- GrOpMemoryPool* opMemoryPool = fContext->contextPriv().opMemoryPool();
+ GrOpMemoryPool* opMemoryPool = fContext->priv().opMemoryPool();
opMemoryPool->isEmpty();
#endif
@@ -338,7 +338,7 @@
// Give the cache a chance to purge resources that become purgeable due to flushing.
if (flushed) {
- fContext->contextPriv().getResourceCache()->purgeAsNeeded();
+ fContext->priv().getResourceCache()->purgeAsNeeded();
}
for (GrOnFlushCallbackObject* onFlushCBObject : fOnFlushCBObjects) {
onFlushCBObject->postFlush(fTokenTracker.nextTokenToFlush(), fFlushingOpListIDs.begin(),
@@ -364,7 +364,7 @@
}
#endif
- GrResourceProvider* resourceProvider = fContext->contextPriv().resourceProvider();
+ GrResourceProvider* resourceProvider = fContext->priv().resourceProvider();
bool anyOpListsExecuted = false;
for (int i = startIndex; i < stopIndex; ++i) {
@@ -389,7 +389,7 @@
// TODO: handle this instantiation via lazy surface proxies?
// Instantiate all deferred proxies (being built on worker threads) so we can upload them
- opList->instantiateDeferredProxies(fContext->contextPriv().resourceProvider());
+ opList->instantiateDeferredProxies(fContext->priv().resourceProvider());
opList->prepare(flushState);
}
@@ -455,7 +455,7 @@
SkDEBUGCODE(this->validate());
SkASSERT(proxy);
- GrGpu* gpu = fContext->contextPriv().getGpu();
+ GrGpu* gpu = fContext->priv().getGpu();
if (!gpu) {
return GrSemaphoresSubmitted::kNo; // Can't flush while DDL recording
}
@@ -465,7 +465,7 @@
result = this->flush(proxy, numSemaphores, backendSemaphores);
}
- if (!proxy->instantiate(fContext->contextPriv().resourceProvider())) {
+ if (!proxy->instantiate(fContext->priv().resourceProvider())) {
return result;
}
@@ -492,7 +492,7 @@
SkDEBUGCODE(this->validate());
// no opList should receive a new command after this
- fDAG.closeAll(fContext->contextPriv().caps());
+ fDAG.closeAll(fContext->priv().caps());
fActiveOpList = nullptr;
fDAG.swap(&ddl->fOpLists);
@@ -515,7 +515,7 @@
// reordering so ops that (in the single opList world) would've just glommed onto the
// end of the single opList but referred to a far earlier RT need to appear in their
// own opList.
- fActiveOpList->makeClosed(*fContext->contextPriv().caps());
+ fActiveOpList->makeClosed(*fContext->priv().caps());
fActiveOpList = nullptr;
}
@@ -570,24 +570,24 @@
// they really only need to be split if they ever reference proxy's contents again but
// that is hard to predict/handle).
if (GrOpList* lastOpList = rtp->getLastOpList()) {
- lastOpList->closeThoseWhoDependOnMe(*fContext->contextPriv().caps());
+ lastOpList->closeThoseWhoDependOnMe(*fContext->priv().caps());
}
} else if (fActiveOpList) {
// This is a temporary fix for the partial-MDB world. In that world we're not
// reordering so ops that (in the single opList world) would've just glommed onto the
// end of the single opList but referred to a far earlier RT need to appear in their
// own opList.
- fActiveOpList->makeClosed(*fContext->contextPriv().caps());
+ fActiveOpList->makeClosed(*fContext->priv().caps());
fActiveOpList = nullptr;
}
- auto resourceProvider = fContext->contextPriv().resourceProvider();
+ auto resourceProvider = fContext->priv().resourceProvider();
sk_sp<GrRenderTargetOpList> opList(new GrRenderTargetOpList(
resourceProvider,
- fContext->contextPriv().refOpMemoryPool(),
+ fContext->priv().refOpMemoryPool(),
rtp,
- fContext->contextPriv().getAuditTrail()));
+ fContext->priv().getAuditTrail()));
SkASSERT(rtp->getLastOpList() == opList.get());
if (managedOpList) {
@@ -613,21 +613,21 @@
// overkill: they really only need to be split if they ever reference proxy's contents
// again but that is hard to predict/handle).
if (GrOpList* lastOpList = textureProxy->getLastOpList()) {
- lastOpList->closeThoseWhoDependOnMe(*fContext->contextPriv().caps());
+ lastOpList->closeThoseWhoDependOnMe(*fContext->priv().caps());
}
} else if (fActiveOpList) {
// This is a temporary fix for the partial-MDB world. In that world we're not
// reordering so ops that (in the single opList world) would've just glommed onto the
// end of the single opList but referred to a far earlier RT need to appear in their
// own opList.
- fActiveOpList->makeClosed(*fContext->contextPriv().caps());
+ fActiveOpList->makeClosed(*fContext->priv().caps());
fActiveOpList = nullptr;
}
- sk_sp<GrTextureOpList> opList(new GrTextureOpList(fContext->contextPriv().resourceProvider(),
- fContext->contextPriv().refOpMemoryPool(),
+ sk_sp<GrTextureOpList> opList(new GrTextureOpList(fContext->priv().resourceProvider(),
+ fContext->priv().refOpMemoryPool(),
textureProxy,
- fContext->contextPriv().getAuditTrail()));
+ fContext->priv().getAuditTrail()));
SkASSERT(textureProxy->getLastOpList() == opList.get());
@@ -677,7 +677,7 @@
GrPathRenderer* GrDrawingManager::getSoftwarePathRenderer() {
if (!fSoftwarePathRenderer) {
fSoftwarePathRenderer.reset(
- new GrSoftwarePathRenderer(fContext->contextPriv().proxyProvider(),
+ new GrSoftwarePathRenderer(fContext->priv().proxyProvider(),
fOptionsForPathRendererChain.fAllowPathMaskCaching));
}
return fSoftwarePathRenderer.get();
@@ -691,7 +691,7 @@
}
void GrDrawingManager::flushIfNecessary() {
- GrResourceCache* resourceCache = fContext->contextPriv().getResourceCache();
+ GrResourceCache* resourceCache = fContext->priv().getResourceCache();
if (resourceCache && resourceCache->requestsFlush()) {
this->flush(nullptr, 0, nullptr);
resourceCache->purgeAsNeeded();
@@ -709,7 +709,7 @@
// SkSurface catches bad color space usage at creation. This check handles anything that slips
// by, including internal usage.
- if (!SkSurface_Gpu::Valid(fContext->contextPriv().caps(), sProxy->config(), colorSpace.get())) {
+ if (!SkSurface_Gpu::Valid(fContext->priv().caps(), sProxy->config(), colorSpace.get())) {
SkDEBUGFAIL("Invalid config and colorspace combination");
return nullptr;
}
@@ -720,7 +720,7 @@
fContext, this, std::move(rtp),
std::move(colorSpace),
surfaceProps,
- fContext->contextPriv().getAuditTrail(),
+ fContext->priv().getAuditTrail(),
fSingleOwner, managedOpList));
}
@@ -732,7 +732,7 @@
// SkSurface catches bad color space usage at creation. This check handles anything that slips
// by, including internal usage.
- if (!SkSurface_Gpu::Valid(fContext->contextPriv().caps(), sProxy->config(), colorSpace.get())) {
+ if (!SkSurface_Gpu::Valid(fContext->priv().caps(), sProxy->config(), colorSpace.get())) {
SkDEBUGFAIL("Invalid config and colorspace combination");
return nullptr;
}
@@ -744,6 +744,6 @@
return sk_sp<GrTextureContext>(new GrTextureContext(fContext, this, std::move(textureProxy),
std::move(colorSpace),
- fContext->contextPriv().getAuditTrail(),
+ fContext->priv().getAuditTrail(),
fSingleOwner));
}
diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp
index af801ca..1462bf1 100644
--- a/src/gpu/GrGpu.cpp
+++ b/src/gpu/GrGpu.cpp
@@ -378,7 +378,7 @@
GrSemaphoresSubmitted GrGpu::finishFlush(int numSemaphores,
GrBackendSemaphore backendSemaphores[]) {
this->stats()->incNumFinishFlushes();
- GrResourceProvider* resourceProvider = fContext->contextPriv().resourceProvider();
+ GrResourceProvider* resourceProvider = fContext->priv().resourceProvider();
if (this->caps()->fenceSyncSupport()) {
for (int i = 0; i < numSemaphores; ++i) {
diff --git a/src/gpu/GrGpuCommandBuffer.cpp b/src/gpu/GrGpuCommandBuffer.cpp
index e0923a2..2684219 100644
--- a/src/gpu/GrGpuCommandBuffer.cpp
+++ b/src/gpu/GrGpuCommandBuffer.cpp
@@ -47,7 +47,7 @@
SkASSERT(!pipeline.isScissorEnabled() || fixedDynamicState ||
(dynamicStateArrays && dynamicStateArrays->fScissorRects));
- auto resourceProvider = this->gpu()->getContext()->contextPriv().resourceProvider();
+ auto resourceProvider = this->gpu()->getContext()->priv().resourceProvider();
if (pipeline.isBad()) {
return false;
diff --git a/src/gpu/GrGpuResource.cpp b/src/gpu/GrGpuResource.cpp
index 02cc617..0c7c3a1 100644
--- a/src/gpu/GrGpuResource.cpp
+++ b/src/gpu/GrGpuResource.cpp
@@ -17,8 +17,8 @@
static inline GrResourceCache* get_resource_cache(GrGpu* gpu) {
SkASSERT(gpu);
SkASSERT(gpu->getContext());
- SkASSERT(gpu->getContext()->contextPriv().getResourceCache());
- return gpu->getContext()->contextPriv().getResourceCache();
+ SkASSERT(gpu->getContext()->priv().getResourceCache());
+ return gpu->getContext()->priv().getResourceCache();
}
GrGpuResource::GrGpuResource(GrGpu* gpu) : fGpu(gpu), fUniqueID(CreateUniqueID()) {
diff --git a/src/gpu/GrOnFlushResourceProvider.cpp b/src/gpu/GrOnFlushResourceProvider.cpp
index e4cbea3..ced73c4 100644
--- a/src/gpu/GrOnFlushResourceProvider.cpp
+++ b/src/gpu/GrOnFlushResourceProvider.cpp
@@ -40,29 +40,29 @@
bool GrOnFlushResourceProvider::assignUniqueKeyToProxy(const GrUniqueKey& key,
GrTextureProxy* proxy) {
- auto proxyProvider = fDrawingMgr->getContext()->contextPriv().proxyProvider();
+ auto proxyProvider = fDrawingMgr->getContext()->priv().proxyProvider();
return proxyProvider->assignUniqueKeyToProxy(key, proxy);
}
void GrOnFlushResourceProvider::removeUniqueKeyFromProxy(GrTextureProxy* proxy) {
- auto proxyProvider = fDrawingMgr->getContext()->contextPriv().proxyProvider();
+ auto proxyProvider = fDrawingMgr->getContext()->priv().proxyProvider();
proxyProvider->removeUniqueKeyFromProxy(proxy);
}
void GrOnFlushResourceProvider::processInvalidUniqueKey(const GrUniqueKey& key) {
- auto proxyProvider = fDrawingMgr->getContext()->contextPriv().proxyProvider();
+ auto proxyProvider = fDrawingMgr->getContext()->priv().proxyProvider();
proxyProvider->processInvalidUniqueKey(key, nullptr,
GrProxyProvider::InvalidateGPUResource::kYes);
}
sk_sp<GrTextureProxy> GrOnFlushResourceProvider::findOrCreateProxyByUniqueKey(
const GrUniqueKey& key, GrSurfaceOrigin origin) {
- auto proxyProvider = fDrawingMgr->getContext()->contextPriv().proxyProvider();
+ auto proxyProvider = fDrawingMgr->getContext()->priv().proxyProvider();
return proxyProvider->findOrCreateProxyByUniqueKey(key, origin);
}
bool GrOnFlushResourceProvider::instatiateProxy(GrSurfaceProxy* proxy) {
- auto resourceProvider = fDrawingMgr->getContext()->contextPriv().resourceProvider();
+ auto resourceProvider = fDrawingMgr->getContext()->priv().resourceProvider();
if (GrSurfaceProxy::LazyState::kNot != proxy->lazyInstantiationState()) {
// DDL TODO: Decide if we ever plan to have these proxies use the GrDeinstantiateTracker
@@ -75,7 +75,7 @@
sk_sp<GrBuffer> GrOnFlushResourceProvider::makeBuffer(GrBufferType intendedType, size_t size,
const void* data) {
- auto resourceProvider = fDrawingMgr->getContext()->contextPriv().resourceProvider();
+ auto resourceProvider = fDrawingMgr->getContext()->priv().resourceProvider();
return sk_sp<GrBuffer>(resourceProvider->createBuffer(size, intendedType,
kDynamic_GrAccessPattern,
GrResourceProvider::Flags::kNone,
@@ -86,7 +86,7 @@
size_t size,
const void* data,
const GrUniqueKey& key) {
- auto resourceProvider = fDrawingMgr->getContext()->contextPriv().resourceProvider();
+ auto resourceProvider = fDrawingMgr->getContext()->priv().resourceProvider();
sk_sp<const GrBuffer> buffer = resourceProvider->findOrMakeStaticBuffer(intendedType, size,
data, key);
// Static buffers should never have pending IO.
@@ -95,9 +95,9 @@
}
uint32_t GrOnFlushResourceProvider::contextID() const {
- return fDrawingMgr->getContext()->contextPriv().contextID();
+ return fDrawingMgr->getContext()->priv().contextID();
}
const GrCaps* GrOnFlushResourceProvider::caps() const {
- return fDrawingMgr->getContext()->contextPriv().caps();
+ return fDrawingMgr->getContext()->priv().caps();
}
diff --git a/src/gpu/GrOpFlushState.cpp b/src/gpu/GrOpFlushState.cpp
index 3e82361..37ee176 100644
--- a/src/gpu/GrOpFlushState.cpp
+++ b/src/gpu/GrOpFlushState.cpp
@@ -166,11 +166,11 @@
}
GrStrikeCache* GrOpFlushState::glyphCache() const {
- return fGpu->getContext()->contextPriv().getGlyphCache();
+ return fGpu->getContext()->priv().getGlyphCache();
}
GrAtlasManager* GrOpFlushState::atlasManager() const {
- return fGpu->getContext()->contextPriv().getAtlasManager();
+ return fGpu->getContext()->priv().getAtlasManager();
}
//////////////////////////////////////////////////////////////////////////////
diff --git a/src/gpu/GrPathRenderer.cpp b/src/gpu/GrPathRenderer.cpp
index 631f96d..d16ff49 100644
--- a/src/gpu/GrPathRenderer.cpp
+++ b/src/gpu/GrPathRenderer.cpp
@@ -45,7 +45,7 @@
#ifdef SK_DEBUG
args.validate();
CanDrawPathArgs canArgs;
- canArgs.fCaps = args.fContext->contextPriv().caps();
+ canArgs.fCaps = args.fContext->priv().caps();
canArgs.fClipConservativeBounds = args.fClipConservativeBounds;
canArgs.fViewMatrix = args.fViewMatrix;
canArgs.fShape = args.fShape;
diff --git a/src/gpu/GrPathRendererChain.cpp b/src/gpu/GrPathRendererChain.cpp
index dd3b0c2..64eb986 100644
--- a/src/gpu/GrPathRendererChain.cpp
+++ b/src/gpu/GrPathRendererChain.cpp
@@ -23,13 +23,13 @@
#include "ops/GrTessellatingPathRenderer.h"
GrPathRendererChain::GrPathRendererChain(GrContext* context, const Options& options) {
- const GrCaps& caps = *context->contextPriv().caps();
+ const GrCaps& caps = *context->priv().caps();
if (options.fGpuPathRenderers & GpuPathRenderers::kDashLine) {
fChain.push_back(sk_make_sp<GrDashLinePathRenderer>());
}
if (options.fGpuPathRenderers & GpuPathRenderers::kStencilAndCover) {
sk_sp<GrPathRenderer> pr(
- GrStencilAndCoverPathRenderer::Create(context->contextPriv().resourceProvider(), caps));
+ GrStencilAndCoverPathRenderer::Create(context->priv().resourceProvider(), caps));
if (pr) {
fChain.push_back(std::move(pr));
}
@@ -41,9 +41,9 @@
using AllowCaching = GrCoverageCountingPathRenderer::AllowCaching;
if (auto ccpr = GrCoverageCountingPathRenderer::CreateIfSupported(
caps, AllowCaching(options.fAllowPathMaskCaching),
- context->contextPriv().contextID())) {
+ context->priv().contextID())) {
fCoverageCountingPathRenderer = ccpr.get();
- context->contextPriv().addOnFlushCallbackObject(fCoverageCountingPathRenderer);
+ context->priv().addOnFlushCallbackObject(fCoverageCountingPathRenderer);
fChain.push_back(std::move(ccpr));
}
}
@@ -55,7 +55,7 @@
}
if (options.fGpuPathRenderers & GpuPathRenderers::kSmall) {
auto spr = sk_make_sp<GrSmallPathRenderer>();
- context->contextPriv().addOnFlushCallbackObject(spr.get());
+ context->priv().addOnFlushCallbackObject(spr.get());
fChain.push_back(std::move(spr));
}
if (options.fGpuPathRenderers & GpuPathRenderers::kTessellating) {
diff --git a/src/gpu/GrProcessor.cpp b/src/gpu/GrProcessor.cpp
index aafe1d8..32be076 100644
--- a/src/gpu/GrProcessor.cpp
+++ b/src/gpu/GrProcessor.cpp
@@ -18,14 +18,14 @@
#if GR_TEST_UTILS
GrResourceProvider* GrProcessorTestData::resourceProvider() {
- return fContext->contextPriv().resourceProvider();
+ return fContext->priv().resourceProvider();
}
GrProxyProvider* GrProcessorTestData::proxyProvider() {
- return fContext->contextPriv().proxyProvider();
+ return fContext->priv().proxyProvider();
}
-const GrCaps* GrProcessorTestData::caps() { return fContext->contextPriv().caps(); }
+const GrCaps* GrProcessorTestData::caps() { return fContext->priv().caps(); }
#if SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
class GrFragmentProcessor;
diff --git a/src/gpu/GrReducedClip.cpp b/src/gpu/GrReducedClip.cpp
index 1be1df7..967386f 100644
--- a/src/gpu/GrReducedClip.cpp
+++ b/src/gpu/GrReducedClip.cpp
@@ -852,7 +852,7 @@
GrShape shape(clipPath, GrStyle::SimpleFill());
GrPathRenderer::CanDrawPathArgs canDrawArgs;
- canDrawArgs.fCaps = context->contextPriv().caps();
+ canDrawArgs.fCaps = context->priv().caps();
canDrawArgs.fClipConservativeBounds = &stencilClip.fixedClip().scissorRect();
canDrawArgs.fViewMatrix = &SkMatrix::I();
canDrawArgs.fShape = &shape;
@@ -860,7 +860,7 @@
canDrawArgs.fHasUserStencilSettings = false;
canDrawArgs.fTargetIsWrappedVkSecondaryCB = renderTargetContext->wrapsVkSecondaryCB();
- GrDrawingManager* dm = context->contextPriv().drawingManager();
+ GrDrawingManager* dm = context->priv().drawingManager();
pr = dm->getPathRenderer(canDrawArgs, false, GrPathRendererChain::DrawType::kStencil,
&stencilSupport);
if (!pr) {
diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp
index a0728fe..2e20901 100644
--- a/src/gpu/GrRenderTargetContext.cpp
+++ b/src/gpu/GrRenderTargetContext.cpp
@@ -172,7 +172,7 @@
, fOpList(sk_ref_sp(fRenderTargetProxy->getLastRenderTargetOpList()))
, fSurfaceProps(SkSurfacePropsCopyOrDefault(surfaceProps))
, fManagedOpList(managedOpList) {
- GrResourceProvider* resourceProvider = context->contextPriv().resourceProvider();
+ GrResourceProvider* resourceProvider = context->priv().resourceProvider();
if (resourceProvider && !resourceProvider->explicitlyAllocateGPUResources()) {
// MDB TODO: to ensure all resources still get allocated in the correct order in the hybrid
// world we need to get the correct opList here so that it, in turn, can grab and hold
@@ -982,7 +982,7 @@
GrAAType aaType = this->chooseAAType(GrAA::kYes, GrAllowMixedSamples::kNo);
if (mode != SkBlendMode::kSrcOver ||
- !fContext->contextPriv().caps()->dynamicStateArrayGeometryProcessorTextureSupport()) {
+ !fContext->priv().caps()->dynamicStateArrayGeometryProcessorTextureSupport()) {
// Draw one at a time with GrFillRectOp and a GrPaint that emulates what GrTextureOp does
const GrXPFactory* xpFactory = SkBlendMode_AsXPFactory(mode);
for (int i = 0; i < cnt; ++i) {
@@ -1645,7 +1645,7 @@
return false;
}
- auto resourceProvider = fContext->contextPriv().resourceProvider();
+ auto resourceProvider = fContext->priv().resourceProvider();
SkTArray<sk_sp<GrSemaphore>> semaphores(numSemaphores);
for (int i = 0; i < numSemaphores; ++i) {
@@ -1934,7 +1934,7 @@
const std::function<WillAddOpFn>& willAddFn) {
ASSERT_SINGLE_OWNER
if (this->drawingManager()->wasAbandoned()) {
- fContext->contextPriv().opMemoryPool()->release(std::move(op));
+ fContext->priv().opMemoryPool()->release(std::move(op));
return;
}
SkDEBUGCODE(this->validate();)
@@ -1949,7 +1949,7 @@
if (!clip.apply(fContext, this, fixedFunctionFlags & GrDrawOp::FixedFunctionFlags::kUsesHWAA,
fixedFunctionFlags & GrDrawOp::FixedFunctionFlags::kUsesStencil, &appliedClip,
&bounds)) {
- fContext->contextPriv().opMemoryPool()->release(std::move(op));
+ fContext->priv().opMemoryPool()->release(std::move(op));
return;
}
@@ -1976,7 +1976,7 @@
GrProcessorSet::Analysis analysis = op->finalize(*this->caps(), &appliedClip);
if (analysis.requiresDstTexture()) {
if (!this->setupDstProxy(this->asRenderTargetProxy(), clip, *op, &dstProxy)) {
- fContext->contextPriv().opMemoryPool()->release(std::move(op));
+ fContext->priv().opMemoryPool()->release(std::move(op));
return;
}
}
@@ -2068,7 +2068,7 @@
SkASSERT(rtProxy->backendFormat().textureType() == GrTextureType::k2D);
const GrBackendFormat& format = rtProxy->backendFormat();
- sk_sp<GrSurfaceContext> sContext = fContext->contextPriv().makeDeferredSurfaceContext(
+ sk_sp<GrSurfaceContext> sContext = fContext->priv().makeDeferredSurfaceContext(
format, desc, origin, GrMipMapped::kNo, fit, SkBudgeted::kYes,
sk_ref_sp(this->colorSpaceInfo().colorSpace()));
if (!sContext) {
diff --git a/src/gpu/GrRenderTargetContext.h b/src/gpu/GrRenderTargetContext.h
index 07b52f0..f1e45bd 100644
--- a/src/gpu/GrRenderTargetContext.h
+++ b/src/gpu/GrRenderTargetContext.h
@@ -378,7 +378,7 @@
void insertEventMarker(const SkString&);
GrFSAAType fsaaType() const { return fRenderTargetProxy->fsaaType(); }
- const GrCaps* caps() const { return fContext->contextPriv().caps(); }
+ const GrCaps* caps() const { return fContext->priv().caps(); }
int width() const { return fRenderTargetProxy->width(); }
int height() const { return fRenderTargetProxy->height(); }
int numColorSamples() const { return fRenderTargetProxy->numColorSamples(); }
@@ -395,7 +395,7 @@
GrRenderTarget* accessRenderTarget() {
// TODO: usage of this entry point needs to be reduced and potentially eliminated
// since it ends the deferral of the GrRenderTarget's allocation
- if (!fRenderTargetProxy->instantiate(fContext->contextPriv().resourceProvider())) {
+ if (!fRenderTargetProxy->instantiate(fContext->priv().resourceProvider())) {
return nullptr;
}
return fRenderTargetProxy->peekRenderTarget();
diff --git a/src/gpu/GrRenderTargetOpList.cpp b/src/gpu/GrRenderTargetOpList.cpp
index a511146..f5469d1 100644
--- a/src/gpu/GrRenderTargetOpList.cpp
+++ b/src/gpu/GrRenderTargetOpList.cpp
@@ -585,7 +585,7 @@
return false;
}
- this->addOp(std::move(op), *context->contextPriv().caps());
+ this->addOp(std::move(op), *context->priv().caps());
return true;
}
diff --git a/src/gpu/GrResourceProvider.cpp b/src/gpu/GrResourceProvider.cpp
index be17b5f..f590176 100644
--- a/src/gpu/GrResourceProvider.cpp
+++ b/src/gpu/GrResourceProvider.cpp
@@ -109,7 +109,7 @@
}
GrContext* context = fGpu->getContext();
- GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider();
+ GrProxyProvider* proxyProvider = context->priv().proxyProvider();
SkColorType colorType;
if (GrPixelConfigToColorType(desc.fConfig, &colorType)) {
@@ -127,7 +127,7 @@
}
auto srcInfo = SkImageInfo::Make(desc.fWidth, desc.fHeight, colorType,
kUnknown_SkAlphaType);
- sk_sp<GrSurfaceContext> sContext = context->contextPriv().makeWrappedSurfaceContext(
+ sk_sp<GrSurfaceContext> sContext = context->priv().makeWrappedSurfaceContext(
std::move(proxy));
if (!sContext) {
return nullptr;
diff --git a/src/gpu/GrSWMaskHelper.cpp b/src/gpu/GrSWMaskHelper.cpp
index 41249be..2f21a67 100644
--- a/src/gpu/GrSWMaskHelper.cpp
+++ b/src/gpu/GrSWMaskHelper.cpp
@@ -108,7 +108,7 @@
// TODO: http://skbug.com/8422: Although this fixes http://skbug.com/8351, it seems like these
// should just participate in the normal allocation process and not need the pending IO flag.
auto surfaceFlags = GrInternalSurfaceFlags::kNone;
- if (!context->contextPriv().resourceProvider()) {
+ if (!context->priv().resourceProvider()) {
// In DDL mode, this texture proxy will be instantiated at flush time, therfore it cannot
// have pending IO.
surfaceFlags |= GrInternalSurfaceFlags::kNoPendingIO;
@@ -123,6 +123,6 @@
#if IS_WEBGL==1
clearFlag = kPerformInitialClear_GrSurfaceFlag;
#endif
- return context->contextPriv().proxyProvider()->createTextureProxy(
+ return context->priv().proxyProvider()->createTextureProxy(
std::move(img), clearFlag, 1, SkBudgeted::kYes, fit, surfaceFlags);
}
diff --git a/src/gpu/GrSoftwarePathRenderer.cpp b/src/gpu/GrSoftwarePathRenderer.cpp
index 5220394..9fd8ecd 100644
--- a/src/gpu/GrSoftwarePathRenderer.cpp
+++ b/src/gpu/GrSoftwarePathRenderer.cpp
@@ -174,7 +174,7 @@
static sk_sp<GrTextureProxy> make_deferred_mask_texture_proxy(GrContext* context, SkBackingFit fit,
int width, int height) {
- GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider();
+ GrProxyProvider* proxyProvider = context->priv().proxyProvider();
GrSurfaceDesc desc;
desc.fWidth = width;
@@ -182,7 +182,7 @@
desc.fConfig = kAlpha_8_GrPixelConfig;
const GrBackendFormat format =
- context->contextPriv().caps()->getBackendFormatFromColorType(kAlpha_8_SkColorType);
+ context->priv().caps()->getBackendFormatFromColorType(kAlpha_8_SkColorType);
// MDB TODO: We're going to fill this proxy with an ASAP upload (which is out of order wrt to
// ops), so it can't have any pending IO.
@@ -331,7 +331,7 @@
SkBackingFit fit = useCache ? SkBackingFit::kExact : SkBackingFit::kApprox;
GrAA aa = GrAAType::kCoverage == args.fAAType ? GrAA::kYes : GrAA::kNo;
- SkTaskGroup* taskGroup = args.fContext->contextPriv().getTaskGroup();
+ SkTaskGroup* taskGroup = args.fContext->priv().getTaskGroup();
if (taskGroup) {
proxy = make_deferred_mask_texture_proxy(args.fContext, fit,
boundsForMask->width(),
@@ -374,7 +374,7 @@
SkASSERT(proxy->origin() == kTopLeft_GrSurfaceOrigin);
fProxyProvider->assignUniqueKeyToProxy(maskKey, proxy.get());
args.fShape->addGenIDChangeListener(
- sk_make_sp<PathInvalidator>(maskKey, args.fContext->contextPriv().contextID()));
+ sk_make_sp<PathInvalidator>(maskKey, args.fContext->priv().contextID()));
}
}
if (inverseFilled) {
diff --git a/src/gpu/GrSurfaceContext.cpp b/src/gpu/GrSurfaceContext.cpp
index a77addd..75059d4 100644
--- a/src/gpu/GrSurfaceContext.cpp
+++ b/src/gpu/GrSurfaceContext.cpp
@@ -52,7 +52,7 @@
if (GrColorType::kUnknown == colorType) {
return false;
}
- return fContext->contextPriv().readSurfacePixels(this, x, y, dstInfo.width(), dstInfo.height(),
+ return fContext->priv().readSurfacePixels(this, x, y, dstInfo.width(), dstInfo.height(),
colorType, dstInfo.colorSpace(), dstBuffer,
dstRowBytes, flags);
}
@@ -71,7 +71,7 @@
if (GrColorType::kUnknown == colorType) {
return false;
}
- return fContext->contextPriv().writeSurfacePixels(this, x, y, srcInfo.width(), srcInfo.height(),
+ return fContext->priv().writeSurfacePixels(this, x, y, srcInfo.width(), srcInfo.height(),
colorType, srcInfo.colorSpace(), srcBuffer,
srcRowBytes, flags);
}
@@ -82,7 +82,7 @@
SkDEBUGCODE(this->validate();)
GR_AUDIT_TRAIL_AUTO_FRAME(fAuditTrail, "GrSurfaceContext::copy");
- if (!fContext->contextPriv().caps()->canCopySurface(this->asSurfaceProxy(), src, srcRect,
+ if (!fContext->priv().caps()->canCopySurface(this->asSurfaceProxy(), src, srcRect,
dstPoint)) {
return false;
}
diff --git a/src/gpu/GrSurfaceProxy.cpp b/src/gpu/GrSurfaceProxy.cpp
index 8b1bce4..6051f51 100644
--- a/src/gpu/GrSurfaceProxy.cpp
+++ b/src/gpu/GrSurfaceProxy.cpp
@@ -353,7 +353,7 @@
return nullptr;
}
- sk_sp<GrSurfaceContext> dstContext(context->contextPriv().makeDeferredSurfaceContext(
+ sk_sp<GrSurfaceContext> dstContext(context->priv().makeDeferredSurfaceContext(
format, dstDesc, src->origin(), mipMapped, fit, budgeted));
if (!dstContext) {
return nullptr;
@@ -383,7 +383,7 @@
return nullptr;
}
- sk_sp<GrSurfaceContext> dstContext(context->contextPriv().makeDeferredSurfaceContext(
+ sk_sp<GrSurfaceContext> dstContext(context->priv().makeDeferredSurfaceContext(
format, dstDesc, origin, GrMipMapped::kNo, SkBackingFit::kExact, SkBudgeted::kYes));
if (!dstContext) {
return nullptr;
diff --git a/src/gpu/GrTexture.cpp b/src/gpu/GrTexture.cpp
index e734233..74f295b 100644
--- a/src/gpu/GrTexture.cpp
+++ b/src/gpu/GrTexture.cpp
@@ -57,7 +57,7 @@
return false;
}
#ifdef SK_DEBUG
- GrResourceCache* cache = texture->getContext()->contextPriv().getResourceCache();
+ GrResourceCache* cache = texture->getContext()->priv().getResourceCache();
int preCount = cache->getResourceCount();
#endif
// Ensure that the texture will be released by the cache when we drop the last ref.
diff --git a/src/gpu/GrTextureAdjuster.cpp b/src/gpu/GrTextureAdjuster.cpp
index 2b8f44c..1544398 100644
--- a/src/gpu/GrTextureAdjuster.cpp
+++ b/src/gpu/GrTextureAdjuster.cpp
@@ -37,7 +37,7 @@
sk_sp<GrTextureProxy> GrTextureAdjuster::refTextureProxyCopy(const CopyParams& copyParams,
bool willBeMipped) {
- GrProxyProvider* proxyProvider = fContext->contextPriv().proxyProvider();
+ GrProxyProvider* proxyProvider = fContext->priv().proxyProvider();
GrUniqueKey key;
this->makeCopyKey(copyParams, &key);
@@ -84,15 +84,15 @@
return nullptr;
}
- SkASSERT(this->width() <= fContext->contextPriv().caps()->maxTextureSize() &&
- this->height() <= fContext->contextPriv().caps()->maxTextureSize());
+ SkASSERT(this->width() <= fContext->priv().caps()->maxTextureSize() &&
+ this->height() <= fContext->priv().caps()->maxTextureSize());
bool needsCopyForMipsOnly = false;
if (!params.isRepeated() ||
- !GrGpu::IsACopyNeededForRepeatWrapMode(fContext->contextPriv().caps(), proxy.get(),
+ !GrGpu::IsACopyNeededForRepeatWrapMode(fContext->priv().caps(), proxy.get(),
proxy->width(), proxy->height(), params.filter(),
©Params, scaleAdjust)) {
- needsCopyForMipsOnly = GrGpu::IsACopyNeededForMips(fContext->contextPriv().caps(),
+ needsCopyForMipsOnly = GrGpu::IsACopyNeededForMips(fContext->priv().caps(),
proxy.get(), params.filter(),
©Params);
if (!needsCopyForMipsOnly) {
diff --git a/src/gpu/GrTextureMaker.cpp b/src/gpu/GrTextureMaker.cpp
index fa4d986..afbfbf0 100644
--- a/src/gpu/GrTextureMaker.cpp
+++ b/src/gpu/GrTextureMaker.cpp
@@ -16,8 +16,8 @@
sk_sp<GrTextureProxy> GrTextureMaker::onRefTextureProxyForParams(const GrSamplerState& params,
bool willBeMipped,
SkScalar scaleAdjust[2]) {
- if (this->width() > fContext->contextPriv().caps()->maxTextureSize() ||
- this->height() > fContext->contextPriv().caps()->maxTextureSize()) {
+ if (this->width() > fContext->priv().caps()->maxTextureSize() ||
+ this->height() > fContext->priv().caps()->maxTextureSize()) {
return nullptr;
}
@@ -28,10 +28,10 @@
bool needsCopyForMipsOnly = false;
if (original) {
if (!params.isRepeated() ||
- !GrGpu::IsACopyNeededForRepeatWrapMode(fContext->contextPriv().caps(), original.get(),
+ !GrGpu::IsACopyNeededForRepeatWrapMode(fContext->priv().caps(), original.get(),
original->width(), original->height(),
params.filter(), ©Params, scaleAdjust)) {
- needsCopyForMipsOnly = GrGpu::IsACopyNeededForMips(fContext->contextPriv().caps(),
+ needsCopyForMipsOnly = GrGpu::IsACopyNeededForMips(fContext->priv().caps(),
original.get(), params.filter(),
©Params);
if (!needsCopyForMipsOnly) {
@@ -40,14 +40,14 @@
}
} else {
if (!params.isRepeated() ||
- !GrGpu::IsACopyNeededForRepeatWrapMode(fContext->contextPriv().caps(), nullptr,
+ !GrGpu::IsACopyNeededForRepeatWrapMode(fContext->priv().caps(), nullptr,
this->width(), this->height(),
params.filter(), ©Params, scaleAdjust)) {
return this->refOriginalTextureProxy(willBeMipped, AllowedTexGenType::kAny);
}
}
- GrProxyProvider* proxyProvider = fContext->contextPriv().proxyProvider();
+ GrProxyProvider* proxyProvider = fContext->priv().proxyProvider();
GrSurfaceOrigin origOrigin = original ? original->origin() : kTopLeft_GrSurfaceOrigin;
GrUniqueKey copyKey;
diff --git a/src/gpu/GrTextureOpList.cpp b/src/gpu/GrTextureOpList.cpp
index ae51807..f63c5a7 100644
--- a/src/gpu/GrTextureOpList.cpp
+++ b/src/gpu/GrTextureOpList.cpp
@@ -148,7 +148,7 @@
return false;
}
- const GrCaps* caps = context->contextPriv().caps();
+ const GrCaps* caps = context->priv().caps();
auto addDependency = [ caps, this ] (GrSurfaceProxy* p) {
this->addDependency(p, *caps);
};
diff --git a/src/gpu/GrTextureProducer.cpp b/src/gpu/GrTextureProducer.cpp
index 9ae2eb4..f11d2a3 100644
--- a/src/gpu/GrTextureProducer.cpp
+++ b/src/gpu/GrTextureProducer.cpp
@@ -52,7 +52,7 @@
}
sk_sp<GrRenderTargetContext> copyRTC =
- context->contextPriv().makeDeferredRenderTargetContextWithFallback(
+ context->priv().makeDeferredRenderTargetContextWithFallback(
format, SkBackingFit::kExact, dstRect.width(), dstRect.height(),
config, nullptr, 1, mipMapped, inputProxy->origin());
if (!copyRTC) {
@@ -235,14 +235,14 @@
int mipCount = SkMipMap::ComputeLevelCount(this->width(), this->height());
bool willBeMipped = GrSamplerState::Filter::kMipMap == sampler.filter() && mipCount &&
- fContext->contextPriv().caps()->mipMapSupport();
+ fContext->priv().caps()->mipMapSupport();
auto result = this->onRefTextureProxyForParams(sampler, willBeMipped, scaleAdjust);
// Check to make sure that if we say the texture willBeMipped that the returned texture has mip
// maps, unless the config is not copyable.
SkASSERT(!result || !willBeMipped || result->mipMapped() == GrMipMapped::kYes ||
- !fContext->contextPriv().caps()->isConfigCopyable(result->config()));
+ !fContext->priv().caps()->isConfigCopyable(result->config()));
// Check that the "no scaling expected" case always returns a proxy of the same size as the
// producer.
@@ -259,14 +259,14 @@
int mipCount = SkMipMap::ComputeLevelCount(this->width(), this->height());
bool willBeMipped = GrSamplerState::Filter::kMipMap == sampler.filter() && mipCount &&
- fContext->contextPriv().caps()->mipMapSupport();
+ fContext->priv().caps()->mipMapSupport();
auto result = this->onRefTextureProxyForParams(sampler, willBeMipped, nullptr);
// Check to make sure that if we say the texture willBeMipped that the returned texture has mip
// maps, unless the config is not copyable.
SkASSERT(!result || !willBeMipped || result->mipMapped() == GrMipMapped::kYes ||
- !fContext->contextPriv().caps()->isConfigCopyable(result->config()));
+ !fContext->priv().caps()->isConfigCopyable(result->config()));
// Check that no scaling occured and we returned a proxy of the same size as the producer.
SkASSERT(!result || (result->width() == this->width() && result->height() == this->height()));
diff --git a/src/gpu/GrTextureProxy.cpp b/src/gpu/GrTextureProxy.cpp
index b15b0b2..71af55b 100644
--- a/src/gpu/GrTextureProxy.cpp
+++ b/src/gpu/GrTextureProxy.cpp
@@ -55,7 +55,7 @@
, fProxyProvider(nullptr)
, fDeferredUploader(nullptr) {
if (fTarget->getUniqueKey().isValid()) {
- fProxyProvider = fTarget->asTexture()->getContext()->contextPriv().proxyProvider();
+ fProxyProvider = fTarget->asTexture()->getContext()->priv().proxyProvider();
fProxyProvider->adoptUniqueKeyFromSurface(this, fTarget);
}
}
diff --git a/src/gpu/GrTracing.h b/src/gpu/GrTracing.h
index 41cb6fa..82c6f8d 100644
--- a/src/gpu/GrTracing.h
+++ b/src/gpu/GrTracing.h
@@ -16,7 +16,7 @@
* Context level GrTracing macros, classname and op are const char*, context is GrContext
*/
#define GR_CREATE_TRACE_MARKER_CONTEXT(classname, op, context) \
- GR_AUDIT_TRAIL_AUTO_FRAME(context->contextPriv().getAuditTrail(), classname "::" op); \
+ GR_AUDIT_TRAIL_AUTO_FRAME(context->priv().getAuditTrail(), classname "::" op); \
TRACE_EVENT0("skia.gpu", classname "::" op)
#endif
diff --git a/src/gpu/GrYUVProvider.cpp b/src/gpu/GrYUVProvider.cpp
index 6b3eb88..a4cab0a 100644
--- a/src/gpu/GrYUVProvider.cpp
+++ b/src/gpu/GrYUVProvider.cpp
@@ -147,7 +147,7 @@
sk_sp<SkImage> yuvImage = SkImage::MakeFromRaster(pixmap, YUVGen_DataReleaseProc,
dataStoragePtr);
- auto proxyProvider = ctx->contextPriv().proxyProvider();
+ auto proxyProvider = ctx->priv().proxyProvider();
yuvTextureProxies[i] = proxyProvider->createTextureProxy(yuvImage, kNone_GrSurfaceFlags,
1, SkBudgeted::kYes, fit);
@@ -157,7 +157,7 @@
// TODO: investigate preallocating mip maps here
sk_sp<GrRenderTargetContext> renderTargetContext(
- ctx->contextPriv().makeDeferredRenderTargetContext(
+ ctx->priv().makeDeferredRenderTargetContext(
format, SkBackingFit::kExact, desc.fWidth, desc.fHeight, desc.fConfig, nullptr,
desc.fSampleCnt, GrMipMapped::kNo, kTopLeft_GrSurfaceOrigin));
if (!renderTargetContext) {
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index cb9718e..dc7aeea 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -56,7 +56,7 @@
#include "text/GrTextTarget.h"
#define ASSERT_SINGLE_OWNER \
-SkDEBUGCODE(GrSingleOwner::AutoEnforce debug_SingleOwner(fContext->contextPriv().debugSingleOwner());)
+SkDEBUGCODE(GrSingleOwner::AutoEnforce debug_SingleOwner(fContext->priv().debugSingleOwner());)
///////////////////////////////////////////////////////////////////////////////
@@ -164,10 +164,10 @@
return nullptr;
}
GrBackendFormat format =
- context->contextPriv().caps()->getBackendFormatFromColorType(origInfo.colorType());
+ context->priv().caps()->getBackendFormatFromColorType(origInfo.colorType());
// This method is used to create SkGpuDevice's for SkSurface_Gpus. In this case
// they need to be exact.
- return context->contextPriv().makeDeferredRenderTargetContext(
+ return context->priv().makeDeferredRenderTargetContext(
format, SkBackingFit::kExact,
origInfo.width(), origInfo.height(),
config, origInfo.refColorSpace(), sampleCount,
@@ -409,7 +409,7 @@
SkPMColor4f dstColor = SkColor4fPrepForDst(SkColor4f::FromColor(color),
fRenderTargetContext->colorSpaceInfo(),
- *fContext->contextPriv().caps())
+ *fContext->priv().caps())
.premul();
GrPaint grPaint;
@@ -770,7 +770,7 @@
bool doBicubic;
GrSamplerState::Filter textureFilterMode = GrSkFilterQualityToGrFilterMode(
quality, viewMatrix, srcToDstRect,
- fContext->contextPriv().options().fSharpenMipmappedTextures, &doBicubic);
+ fContext->priv().options().fSharpenMipmappedTextures, &doBicubic);
int tileFilterPad;
if (doBicubic) {
@@ -821,7 +821,7 @@
bool doBicubic;
GrSamplerState::Filter textureFilterMode = GrSkFilterQualityToGrFilterMode(
paint.getFilterQuality(), viewMatrix, SkMatrix::I(),
- fContext->contextPriv().options().fSharpenMipmappedTextures, &doBicubic);
+ fContext->priv().options().fSharpenMipmappedTextures, &doBicubic);
int tileFilterPad;
@@ -1180,7 +1180,7 @@
bool doBicubic;
GrSamplerState::Filter textureFilterMode = GrSkFilterQualityToGrFilterMode(
paint.getFilterQuality(), this->ctm(), srcToDstMatrix,
- fContext->contextPriv().options().fSharpenMipmappedTextures, &doBicubic);
+ fContext->priv().options().fSharpenMipmappedTextures, &doBicubic);
int tileFilterPad;
@@ -1209,7 +1209,7 @@
sk_sp<SkSpecialImage> SkGpuDevice::makeSpecial(const SkBitmap& bitmap) {
// TODO: this makes a tight copy of 'bitmap' but it doesn't have to be (given SkSpecialImage's
// semantics). Since this is cached we would have to bake the fit into the cache key though.
- sk_sp<GrTextureProxy> proxy = GrMakeCachedBitmapProxy(fContext->contextPriv().proxyProvider(),
+ sk_sp<GrTextureProxy> proxy = GrMakeCachedBitmapProxy(fContext->priv().proxyProvider(),
bitmap);
if (!proxy) {
return nullptr;
@@ -1815,10 +1815,10 @@
// channel in the layer.
config = kRGBA_8888_GrPixelConfig;
format =
- fContext->contextPriv().caps()->getBackendFormatFromColorType(kRGBA_8888_SkColorType);
+ fContext->priv().caps()->getBackendFormatFromColorType(kRGBA_8888_SkColorType);
}
- sk_sp<GrRenderTargetContext> rtc(fContext->contextPriv().makeDeferredRenderTargetContext(
+ sk_sp<GrRenderTargetContext> rtc(fContext->priv().makeDeferredRenderTargetContext(
format, fit, cinfo.fInfo.width(), cinfo.fInfo.height(), config,
fRenderTargetContext->colorSpaceInfo().refColorSpace(),
fRenderTargetContext->numStencilSamples(), GrMipMapped::kNo,
diff --git a/src/gpu/SkGpuDevice.h b/src/gpu/SkGpuDevice.h
index fdd8cbc..3710707 100644
--- a/src/gpu/SkGpuDevice.h
+++ b/src/gpu/SkGpuDevice.h
@@ -157,7 +157,7 @@
GrClipStackClip clip() const { return GrClipStackClip(&this->cs()); }
- const GrCaps* caps() const { return fContext->contextPriv().caps(); }
+ const GrCaps* caps() const { return fContext->priv().caps(); }
/**
* Helper functions called by drawBitmapCommon. By the time these are called the SkDraw's
diff --git a/src/gpu/SkGpuDevice_drawTexture.cpp b/src/gpu/SkGpuDevice_drawTexture.cpp
index 2ce46ec..63ab4f9 100644
--- a/src/gpu/SkGpuDevice_drawTexture.cpp
+++ b/src/gpu/SkGpuDevice_drawTexture.cpp
@@ -251,7 +251,7 @@
bool doBicubic;
GrSamplerState::Filter fm = GrSkFilterQualityToGrFilterMode(
paint.getFilterQuality(), viewMatrix, srcToDstMatrix,
- fContext->contextPriv().options().fSharpenMipmappedTextures, &doBicubic);
+ fContext->priv().options().fSharpenMipmappedTextures, &doBicubic);
const GrSamplerState::Filter* filterMode = doBicubic ? nullptr : &fm;
GrTextureProducer::FilterConstraint constraintMode;
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp
index 27b4248..972dff3 100644
--- a/src/gpu/SkGr.cpp
+++ b/src/gpu/SkGr.cpp
@@ -148,11 +148,11 @@
sk_sp<GrTextureProxy> GrCopyBaseMipMapToTextureProxy(GrContext* ctx, GrTextureProxy* baseProxy) {
SkASSERT(baseProxy);
- if (!ctx->contextPriv().caps()->isConfigCopyable(baseProxy->config())) {
+ if (!ctx->priv().caps()->isConfigCopyable(baseProxy->config())) {
return nullptr;
}
- GrProxyProvider* proxyProvider = ctx->contextPriv().proxyProvider();
+ GrProxyProvider* proxyProvider = ctx->priv().proxyProvider();
GrSurfaceDesc desc;
desc.fFlags = kNone_GrSurfaceFlags;
desc.fWidth = baseProxy->width();
@@ -172,8 +172,7 @@
}
// Copy the base layer to our proxy
- sk_sp<GrSurfaceContext> sContext =
- ctx->contextPriv().makeWrappedSurfaceContext(proxy);
+ sk_sp<GrSurfaceContext> sContext = ctx->priv().makeWrappedSurfaceContext(proxy);
SkASSERT(sContext);
SkAssertResult(sContext->copy(baseProxy));
@@ -378,7 +377,7 @@
GrPaint* grPaint) {
// Convert SkPaint color to 4f format in the destination color space
SkColor4f origColor = SkColor4fPrepForDst(skPaint.getColor4f(), colorSpaceInfo,
- *context->contextPriv().caps());
+ *context->priv().caps());
const GrFPArgs fpArgs(context, &viewM, skPaint.getFilterQuality(), &colorSpaceInfo);
diff --git a/src/gpu/ccpr/GrCCDrawPathsOp.cpp b/src/gpu/ccpr/GrCCDrawPathsOp.cpp
index 0b4feb6..643118a 100644
--- a/src/gpu/ccpr/GrCCDrawPathsOp.cpp
+++ b/src/gpu/ccpr/GrCCDrawPathsOp.cpp
@@ -91,7 +91,7 @@
return nullptr;
}
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<GrCCDrawPathsOp>(m, shape, strokeDevWidth, shapeConservativeIBounds,
maskDevIBounds, conservativeDevBounds, std::move(paint));
}
diff --git a/src/gpu/ccpr/GrCCPerFlushResources.cpp b/src/gpu/ccpr/GrCCPerFlushResources.cpp
index 7b7a3d1..54e395c 100644
--- a/src/gpu/ccpr/GrCCPerFlushResources.cpp
+++ b/src/gpu/ccpr/GrCCPerFlushResources.cpp
@@ -60,7 +60,7 @@
sk_sp<const GrCCPerFlushResources> resources,
sk_sp<GrTextureProxy> copyProxy, int baseInstance,
int endInstance, const SkISize& drawBounds) {
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<CopyAtlasOp>(std::move(resources), std::move(copyProxy),
baseInstance, endInstance, drawBounds);
@@ -105,7 +105,7 @@
sk_sp<const GrCCPerFlushResources> resources,
FillBatchID fillBatchID, StrokeBatchID strokeBatchID,
const SkISize& drawBounds) {
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<RenderAtlasOp>(std::move(resources), fillBatchID, strokeBatchID,
drawBounds);
diff --git a/src/gpu/effects/GrConfigConversionEffect.fp b/src/gpu/effects/GrConfigConversionEffect.fp
index 6cee538..071da19 100644
--- a/src/gpu/effects/GrConfigConversionEffect.fp
+++ b/src/gpu/effects/GrConfigConversionEffect.fp
@@ -19,7 +19,7 @@
static constexpr GrPixelConfig kConfig = kRGBA_8888_GrPixelConfig;
static constexpr SkColorType kColorType = kRGBA_8888_SkColorType;
const GrBackendFormat format =
- context->contextPriv().caps()->getBackendFormatFromColorType(kColorType);
+ context->priv().caps()->getBackendFormatFromColorType(kColorType);
SkAutoTMalloc<uint32_t> data(kSize * kSize * 3);
uint32_t* srcData = data.get();
uint32_t* firstRead = data.get() + kSize * kSize;
@@ -44,13 +44,13 @@
kRGBA_8888_SkColorType, kPremul_SkAlphaType);
sk_sp<GrRenderTargetContext> readRTC(
- context->contextPriv().makeDeferredRenderTargetContext(format, SkBackingFit::kExact,
- kSize, kSize,
- kConfig, nullptr));
+ context->priv().makeDeferredRenderTargetContext(format, SkBackingFit::kExact,
+ kSize, kSize,
+ kConfig, nullptr));
sk_sp<GrRenderTargetContext> tempRTC(
- context->contextPriv().makeDeferredRenderTargetContext(format, SkBackingFit::kExact,
- kSize, kSize,
- kConfig, nullptr));
+ context->priv().makeDeferredRenderTargetContext(format, SkBackingFit::kExact,
+ kSize, kSize,
+ kConfig, nullptr));
if (!readRTC || !readRTC->asTextureProxy() || !tempRTC) {
return false;
}
@@ -58,7 +58,7 @@
// draw
readRTC->discard();
- GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider();
+ GrProxyProvider* proxyProvider = context->priv().proxyProvider();
SkPixmap pixmap(ii, srcData, 4 * kSize);
diff --git a/src/gpu/effects/GrConfigConversionEffect.h b/src/gpu/effects/GrConfigConversionEffect.h
index 301a6f9..b182765 100644
--- a/src/gpu/effects/GrConfigConversionEffect.h
+++ b/src/gpu/effects/GrConfigConversionEffect.h
@@ -26,7 +26,7 @@
static constexpr GrPixelConfig kConfig = kRGBA_8888_GrPixelConfig;
static constexpr SkColorType kColorType = kRGBA_8888_SkColorType;
const GrBackendFormat format =
- context->contextPriv().caps()->getBackendFormatFromColorType(kColorType);
+ context->priv().caps()->getBackendFormatFromColorType(kColorType);
SkAutoTMalloc<uint32_t> data(kSize * kSize * 3);
uint32_t* srcData = data.get();
uint32_t* firstRead = data.get() + kSize * kSize;
@@ -50,9 +50,9 @@
const SkImageInfo ii =
SkImageInfo::Make(kSize, kSize, kRGBA_8888_SkColorType, kPremul_SkAlphaType);
- sk_sp<GrRenderTargetContext> readRTC(context->contextPriv().makeDeferredRenderTargetContext(
+ sk_sp<GrRenderTargetContext> readRTC(context->priv().makeDeferredRenderTargetContext(
format, SkBackingFit::kExact, kSize, kSize, kConfig, nullptr));
- sk_sp<GrRenderTargetContext> tempRTC(context->contextPriv().makeDeferredRenderTargetContext(
+ sk_sp<GrRenderTargetContext> tempRTC(context->priv().makeDeferredRenderTargetContext(
format, SkBackingFit::kExact, kSize, kSize, kConfig, nullptr));
if (!readRTC || !readRTC->asTextureProxy() || !tempRTC) {
return false;
@@ -61,7 +61,7 @@
// draw
readRTC->discard();
- GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider();
+ GrProxyProvider* proxyProvider = context->priv().proxyProvider();
SkPixmap pixmap(ii, srcData, 4 * kSize);
diff --git a/src/gpu/effects/GrRRectBlurEffect.fp b/src/gpu/effects/GrRRectBlurEffect.fp
index ccaad63..7bbd0a5 100644
--- a/src/gpu/effects/GrRRectBlurEffect.fp
+++ b/src/gpu/effects/GrRRectBlurEffect.fp
@@ -46,16 +46,16 @@
}
builder.finish();
- GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider();
+ GrProxyProvider* proxyProvider = context->priv().proxyProvider();
sk_sp<GrTextureProxy> mask(proxyProvider->findOrCreateProxyByUniqueKey(
key, kBottomLeft_GrSurfaceOrigin));
if (!mask) {
GrBackendFormat format =
- context->contextPriv().caps()->getBackendFormatFromColorType(kAlpha_8_SkColorType);
+ context->priv().caps()->getBackendFormatFromColorType(kAlpha_8_SkColorType);
// TODO: this could be approx but the texture coords will need to be updated
sk_sp<GrRenderTargetContext> rtc(
- context->contextPriv().makeDeferredRenderTargetContextWithFallback(
+ context->priv().makeDeferredRenderTargetContextWithFallback(
format, SkBackingFit::kExact, size.fWidth,
size.fHeight, kAlpha_8_GrPixelConfig, nullptr));
if (!rtc) {
diff --git a/src/gpu/effects/GrRRectBlurEffect.h b/src/gpu/effects/GrRRectBlurEffect.h
index a774e2c..4f616e5 100644
--- a/src/gpu/effects/GrRRectBlurEffect.h
+++ b/src/gpu/effects/GrRRectBlurEffect.h
@@ -46,16 +46,16 @@
}
builder.finish();
- GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider();
+ GrProxyProvider* proxyProvider = context->priv().proxyProvider();
sk_sp<GrTextureProxy> mask(
proxyProvider->findOrCreateProxyByUniqueKey(key, kBottomLeft_GrSurfaceOrigin));
if (!mask) {
- GrBackendFormat format = context->contextPriv().caps()->getBackendFormatFromColorType(
+ GrBackendFormat format = context->priv().caps()->getBackendFormatFromColorType(
kAlpha_8_SkColorType);
// TODO: this could be approx but the texture coords will need to be updated
sk_sp<GrRenderTargetContext> rtc(
- context->contextPriv().makeDeferredRenderTargetContextWithFallback(
+ context->priv().makeDeferredRenderTargetContextWithFallback(
format, SkBackingFit::kExact, size.fWidth, size.fHeight,
kAlpha_8_GrPixelConfig, nullptr));
if (!rtc) {
diff --git a/src/gpu/effects/GrSkSLFP.cpp b/src/gpu/effects/GrSkSLFP.cpp
index aa81ea5..7463c28 100644
--- a/src/gpu/effects/GrSkSLFP.cpp
+++ b/src/gpu/effects/GrSkSLFP.cpp
@@ -234,8 +234,8 @@
std::unique_ptr<GrSkSLFP> GrSkSLFP::Make(GrContext* context, int index, const char* name,
const char* sksl, const void* inputs,
size_t inputSize) {
- return std::unique_ptr<GrSkSLFP>(new GrSkSLFP(context->contextPriv().getFPFactoryCache(),
- context->contextPriv().caps()->shaderCaps(),
+ return std::unique_ptr<GrSkSLFP>(new GrSkSLFP(context->priv().getFPFactoryCache(),
+ context->priv().caps()->shaderCaps(),
index, name, sksl, inputs, inputSize));
}
diff --git a/src/gpu/gl/GrGLGpuCommandBuffer.cpp b/src/gpu/gl/GrGLGpuCommandBuffer.cpp
index 912ffe7..502c845 100644
--- a/src/gpu/gl/GrGLGpuCommandBuffer.cpp
+++ b/src/gpu/gl/GrGLGpuCommandBuffer.cpp
@@ -28,7 +28,7 @@
const GrGpuRTCommandBuffer::StencilLoadAndStoreInfo& stencilInfo) {
SkASSERT(fGpu);
SkASSERT(!fRenderTarget);
- SkASSERT(fGpu == rt->getContext()->contextPriv().getGpu());
+ SkASSERT(fGpu == rt->getContext()->priv().getGpu());
this->INHERITED::set(rt, origin);
fColorLoadAndStoreInfo = colorInfo;
diff --git a/src/gpu/gl/GrGLRenderTarget.cpp b/src/gpu/gl/GrGLRenderTarget.cpp
index f2913f3..e90ca90 100644
--- a/src/gpu/gl/GrGLRenderTarget.cpp
+++ b/src/gpu/gl/GrGLRenderTarget.cpp
@@ -195,7 +195,7 @@
}
bool GrGLRenderTarget::canAttemptStencilAttachment() const {
- if (this->getGpu()->getContext()->contextPriv().caps()->avoidStencilBuffers()) {
+ if (this->getGpu()->getContext()->priv().caps()->avoidStencilBuffers()) {
return false;
}
diff --git a/src/gpu/gl/GrGLTextureRenderTarget.cpp b/src/gpu/gl/GrGLTextureRenderTarget.cpp
index 17dc562..4069b67 100644
--- a/src/gpu/gl/GrGLTextureRenderTarget.cpp
+++ b/src/gpu/gl/GrGLTextureRenderTarget.cpp
@@ -53,7 +53,7 @@
bool GrGLTextureRenderTarget::canAttemptStencilAttachment() const {
// The RT FBO of GrGLTextureRenderTarget is never created from a
// wrapped FBO, so we only care about the flag.
- return !this->getGpu()->getContext()->contextPriv().caps()->avoidStencilBuffers();
+ return !this->getGpu()->getContext()->priv().caps()->avoidStencilBuffers();
}
sk_sp<GrGLTextureRenderTarget> GrGLTextureRenderTarget::MakeWrapped(
diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp
index acf7d99..8640da3 100644
--- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp
+++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp
@@ -45,7 +45,7 @@
GrGLProgramBuilder builder(gpu, renderTarget, origin,
pipeline, primProc, primProcProxies, desc);
- auto persistentCache = gpu->getContext()->contextPriv().getPersistentCache();
+ auto persistentCache = gpu->getContext()->priv().getPersistentCache();
if (persistentCache) {
sk_sp<SkData> key = SkData::MakeWithoutCopy(desc->asKey(), desc->keyLength());
builder.fCached = persistentCache->load(*key);
@@ -173,7 +173,7 @@
void GrGLProgramBuilder::storeShaderInCache(const SkSL::Program::Inputs& inputs, GrGLuint programID,
const SkSL::String& glsl) {
- if (!this->gpu()->getContext()->contextPriv().getPersistentCache()) {
+ if (!this->gpu()->getContext()->priv().getPersistentCache()) {
return;
}
sk_sp<SkData> key = SkData::MakeWithoutCopy(desc()->asKey(), desc()->keyLength());
@@ -193,7 +193,7 @@
memcpy(data.get() + offset, &binaryFormat, sizeof(binaryFormat));
offset += sizeof(binaryFormat);
memcpy(data.get() + offset, binary.get(), length);
- this->gpu()->getContext()->contextPriv().getPersistentCache()->store(
+ this->gpu()->getContext()->priv().getPersistentCache()->store(
*key, *SkData::MakeWithoutCopy(data.get(), dataLength));
}
} else {
@@ -204,7 +204,7 @@
memcpy(data.get() + offset, &inputs, sizeof(inputs));
offset += sizeof(inputs);
memcpy(data.get() + offset, glsl.data(), glsl.length());
- this->gpu()->getContext()->contextPriv().getPersistentCache()->store(
+ this->gpu()->getContext()->priv().getPersistentCache()->store(
*key, *SkData::MakeWithoutCopy(data.get(), dataLength));
}
}
@@ -220,7 +220,7 @@
}
if (this->gpu()->glCaps().programBinarySupport() &&
- this->gpu()->getContext()->contextPriv().getPersistentCache()) {
+ this->gpu()->getContext()->priv().getPersistentCache()) {
GL_CALL(ProgramParameteri(programID, GR_GL_PROGRAM_BINARY_RETRIEVABLE_HINT, GR_GL_TRUE));
}
@@ -232,7 +232,7 @@
settings.fCaps = this->gpu()->glCaps().shaderCaps();
settings.fFlipY = this->origin() != kTopLeft_GrSurfaceOrigin;
settings.fSharpenTextures =
- this->gpu()->getContext()->contextPriv().options().fSharpenMipmappedTextures;
+ this->gpu()->getContext()->priv().options().fSharpenMipmappedTextures;
settings.fFragColorIsInOut = this->fragColorIsInOut();
SkSL::Program::Inputs inputs;
diff --git a/src/gpu/gradients/GrGradientShader.cpp b/src/gpu/gradients/GrGradientShader.cpp
index 7ba231e..7bf1866 100644
--- a/src/gpu/gradients/GrGradientShader.cpp
+++ b/src/gpu/gradients/GrGradientShader.cpp
@@ -44,7 +44,7 @@
// TODO: Use 1010102 for opaque gradients, at least if destination is 1010102?
SkColorType colorType = kRGBA_8888_SkColorType;
if (kLow_GrSLPrecision != GrSLSamplerPrecision(args.fDstColorSpaceInfo->config()) &&
- args.fContext->contextPriv().caps()->isConfigTexturable(kRGBA_half_GrPixelConfig)) {
+ args.fContext->priv().caps()->isConfigTexturable(kRGBA_half_GrPixelConfig)) {
colorType = kRGBA_F16_SkColorType;
}
SkAlphaType alphaType = premul ? kPremul_SkAlphaType : kUnpremul_SkAlphaType;
@@ -55,7 +55,7 @@
SkASSERT(bitmap.isImmutable());
sk_sp<GrTextureProxy> proxy = GrMakeCachedBitmapProxy(
- args.fContext->contextPriv().proxyProvider(), bitmap);
+ args.fContext->priv().proxyProvider(), bitmap);
if (proxy == nullptr) {
SkDebugf("Gradient won't draw. Could not create texture.");
return nullptr;
@@ -103,7 +103,7 @@
// 32-bit, output can be incorrect if the thresholds are too close together. However, the
// analytic shaders are higher quality, so they can be used with lower precision hardware when
// the thresholds are not ill-conditioned.
- const GrShaderCaps* caps = args.fContext->contextPriv().caps()->shaderCaps();
+ const GrShaderCaps* caps = args.fContext->priv().caps()->shaderCaps();
if (!caps->floatIs32Bits() && tryAnalyticColorizer) {
// Could run into problems, check if thresholds are close together (with a limit of .01, so
// that scales will be less than 100, which leaves 4 decimals of precision on 16-bit).
diff --git a/src/gpu/mtl/GrMtlPipelineStateBuilder.mm b/src/gpu/mtl/GrMtlPipelineStateBuilder.mm
index d95684c..6582840 100644
--- a/src/gpu/mtl/GrMtlPipelineStateBuilder.mm
+++ b/src/gpu/mtl/GrMtlPipelineStateBuilder.mm
@@ -319,8 +319,7 @@
SkSL::Program::Settings settings;
settings.fCaps = this->caps()->shaderCaps();
settings.fFlipY = this->origin() != kTopLeft_GrSurfaceOrigin;
- settings.fSharpenTextures =
- fGpu->getContext()->contextPriv().options().fSharpenMipmappedTextures;
+ settings.fSharpenTextures = fGpu->getContext()->priv().options().fSharpenMipmappedTextures;
SkASSERT(!this->fragColorIsInOut());
id<MTLLibrary> vertexLibrary = nil;
diff --git a/src/gpu/ops/GrAAFillRRectOp.cpp b/src/gpu/ops/GrAAFillRRectOp.cpp
index 2811fda..d472fae 100644
--- a/src/gpu/ops/GrAAFillRRectOp.cpp
+++ b/src/gpu/ops/GrAAFillRRectOp.cpp
@@ -35,7 +35,7 @@
return nullptr;
}
- GrOpMemoryPool* pool = ctx->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = ctx->priv().opMemoryPool();
return pool->allocate<GrAAFillRRectOp>(*caps.shaderCaps(), viewMatrix, rrect, std::move(paint));
}
diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp
index 667e230..d4ffc7c 100644
--- a/src/gpu/ops/GrAtlasTextOp.cpp
+++ b/src/gpu/ops/GrAtlasTextOp.cpp
@@ -29,7 +29,7 @@
GrMaskFormat maskFormat,
int glyphCount,
bool needsTransform) {
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
std::unique_ptr<GrAtlasTextOp> op = pool->allocate<GrAtlasTextOp>(std::move(paint));
@@ -61,7 +61,7 @@
const SkSurfaceProps& props,
bool isAntiAliased,
bool useLCD) {
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
std::unique_ptr<GrAtlasTextOp> op = pool->allocate<GrAtlasTextOp>(std::move(paint));
diff --git a/src/gpu/ops/GrClearOp.cpp b/src/gpu/ops/GrClearOp.cpp
index 369a9d5..d0ee441 100644
--- a/src/gpu/ops/GrClearOp.cpp
+++ b/src/gpu/ops/GrClearOp.cpp
@@ -21,7 +21,7 @@
return nullptr;
}
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<GrClearOp>(clip, color, dstProxy);
}
@@ -32,7 +32,7 @@
bool fullScreen) {
SkASSERT(fullScreen || !rect.isEmpty());
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<GrClearOp>(rect, color, fullScreen);
}
diff --git a/src/gpu/ops/GrClearStencilClipOp.cpp b/src/gpu/ops/GrClearStencilClipOp.cpp
index 17db9f2..99cfd5f 100644
--- a/src/gpu/ops/GrClearStencilClipOp.cpp
+++ b/src/gpu/ops/GrClearStencilClipOp.cpp
@@ -14,7 +14,7 @@
const GrFixedClip& clip,
bool insideStencilMask,
GrRenderTargetProxy* proxy) {
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<GrClearStencilClipOp>(clip, insideStencilMask, proxy);
}
diff --git a/src/gpu/ops/GrCopySurfaceOp.cpp b/src/gpu/ops/GrCopySurfaceOp.cpp
index 9e3a521..8d8e9f1 100644
--- a/src/gpu/ops/GrCopySurfaceOp.cpp
+++ b/src/gpu/ops/GrCopySurfaceOp.cpp
@@ -81,7 +81,7 @@
return nullptr;
}
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<GrCopySurfaceOp>(dstProxy, srcProxy, clippedSrcRect, clippedDstPoint);
}
diff --git a/src/gpu/ops/GrDashOp.cpp b/src/gpu/ops/GrDashOp.cpp
index beed368..1cc378c 100644
--- a/src/gpu/ops/GrDashOp.cpp
+++ b/src/gpu/ops/GrDashOp.cpp
@@ -215,7 +215,7 @@
SkPaint::Cap cap,
AAMode aaMode, bool fullDash,
const GrUserStencilSettings* stencilSettings) {
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<DashOp>(std::move(paint), geometry, cap,
aaMode, fullDash, stencilSettings);
diff --git a/src/gpu/ops/GrDebugMarkerOp.cpp b/src/gpu/ops/GrDebugMarkerOp.cpp
index ebeba8c..a6d06dc 100644
--- a/src/gpu/ops/GrDebugMarkerOp.cpp
+++ b/src/gpu/ops/GrDebugMarkerOp.cpp
@@ -17,7 +17,7 @@
std::unique_ptr<GrOp> GrDebugMarkerOp::Make(GrContext* context,
GrRenderTargetProxy* proxy,
const SkString& str) {
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<GrDebugMarkerOp>(proxy, str);
}
diff --git a/src/gpu/ops/GrDrawPathOp.cpp b/src/gpu/ops/GrDrawPathOp.cpp
index 8d02106..e162b05 100644
--- a/src/gpu/ops/GrDrawPathOp.cpp
+++ b/src/gpu/ops/GrDrawPathOp.cpp
@@ -68,7 +68,7 @@
GrPaint&& paint,
GrAAType aaType,
GrPath* path) {
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<GrDrawPathOp>(viewMatrix, std::move(paint), aaType, path);
}
diff --git a/src/gpu/ops/GrDrawVerticesOp.cpp b/src/gpu/ops/GrDrawVerticesOp.cpp
index 6a84c3f..bdcc20c 100644
--- a/src/gpu/ops/GrDrawVerticesOp.cpp
+++ b/src/gpu/ops/GrDrawVerticesOp.cpp
@@ -609,7 +609,7 @@
do {
type = GrPrimitiveType(random->nextULessThan(kNumGrPrimitiveTypes));
} while (GrPrimTypeRequiresGeometryShaderSupport(type) &&
- !context->contextPriv().caps()->shaderCaps()->geometryShaderSupport());
+ !context->priv().caps()->shaderCaps()->geometryShaderSupport());
uint32_t primitiveCount = random->nextRangeU(1, 100);
diff --git a/src/gpu/ops/GrDrawableOp.cpp b/src/gpu/ops/GrDrawableOp.cpp
index 1b0bbd2..834fedd 100644
--- a/src/gpu/ops/GrDrawableOp.cpp
+++ b/src/gpu/ops/GrDrawableOp.cpp
@@ -17,7 +17,7 @@
std::unique_ptr<GrDrawableOp> GrDrawableOp::Make(
GrContext* context, std::unique_ptr<SkDrawable::GpuDrawHandler> drawable,
const SkRect& bounds) {
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<GrDrawableOp>(std::move(drawable), bounds);
}
diff --git a/src/gpu/ops/GrLatticeOp.cpp b/src/gpu/ops/GrLatticeOp.cpp
index 6b9a448..948b7db 100644
--- a/src/gpu/ops/GrLatticeOp.cpp
+++ b/src/gpu/ops/GrLatticeOp.cpp
@@ -398,8 +398,8 @@
GrSurfaceOrigin origin =
random->nextBool() ? kTopLeft_GrSurfaceOrigin : kBottomLeft_GrSurfaceOrigin;
const GrBackendFormat format =
- context->contextPriv().caps()->getBackendFormatFromColorType(kRGBA_8888_SkColorType);
- auto proxy = context->contextPriv().proxyProvider()->createProxy(
+ context->priv().caps()->getBackendFormatFromColorType(kRGBA_8888_SkColorType);
+ auto proxy = context->priv().proxyProvider()->createProxy(
format, desc, origin, SkBackingFit::kExact, SkBudgeted::kYes);
do {
diff --git a/src/gpu/ops/GrSemaphoreOp.cpp b/src/gpu/ops/GrSemaphoreOp.cpp
index b0a96eb..7160f20 100644
--- a/src/gpu/ops/GrSemaphoreOp.cpp
+++ b/src/gpu/ops/GrSemaphoreOp.cpp
@@ -20,7 +20,7 @@
static std::unique_ptr<GrOp> Make(GrContext* context,
sk_sp<GrSemaphore> semaphore,
GrRenderTargetProxy* proxy) {
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<GrWaitSemaphoreOp>(std::move(semaphore), proxy);
}
diff --git a/src/gpu/ops/GrShadowRRectOp.cpp b/src/gpu/ops/GrShadowRRectOp.cpp
index fdbb82d..dd091a3 100644
--- a/src/gpu/ops/GrShadowRRectOp.cpp
+++ b/src/gpu/ops/GrShadowRRectOp.cpp
@@ -640,7 +640,7 @@
SkScalar scaledRadius = SkScalarAbs(radius*matrixFactor);
SkScalar scaledInsetWidth = SkScalarAbs(insetWidth*matrixFactor);
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<ShadowCircularRRectOp>(color, bounds,
scaledRadius,
diff --git a/src/gpu/ops/GrSimpleMeshDrawOpHelper.h b/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
index f9c6f41..8ed33af 100644
--- a/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
+++ b/src/gpu/ops/GrSimpleMeshDrawOpHelper.h
@@ -196,7 +196,7 @@
std::unique_ptr<GrDrawOp> GrSimpleMeshDrawOpHelper::FactoryHelper(GrContext* context,
GrPaint&& paint,
OpArgs... opArgs) {
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
MakeArgs makeArgs;
diff --git a/src/gpu/ops/GrSmallPathRenderer.cpp b/src/gpu/ops/GrSmallPathRenderer.cpp
index 3eb884b..5132319 100644
--- a/src/gpu/ops/GrSmallPathRenderer.cpp
+++ b/src/gpu/ops/GrSmallPathRenderer.cpp
@@ -873,9 +873,9 @@
SkASSERT(args.fShape->hasUnstyledKey());
if (!fAtlas) {
const GrBackendFormat format =
- args.fContext->contextPriv().caps()->getBackendFormatFromColorType(
+ args.fContext->priv().caps()->getBackendFormatFromColorType(
kAlpha_8_SkColorType);
- fAtlas = GrDrawOpAtlas::Make(args.fContext->contextPriv().proxyProvider(),
+ fAtlas = GrDrawOpAtlas::Make(args.fContext->priv().proxyProvider(),
format,
kAlpha_8_GrPixelConfig,
ATLAS_TEXTURE_WIDTH, ATLAS_TEXTURE_HEIGHT,
@@ -960,12 +960,12 @@
using PathTestStruct = GrSmallPathRenderer::PathTestStruct;
static PathTestStruct gTestStruct;
- if (context->contextPriv().contextID() != gTestStruct.fContextID) {
- gTestStruct.fContextID = context->contextPriv().contextID();
+ if (context->priv().contextID() != gTestStruct.fContextID) {
+ gTestStruct.fContextID = context->priv().contextID();
gTestStruct.reset();
const GrBackendFormat format =
- context->contextPriv().caps()->getBackendFormatFromColorType(kAlpha_8_SkColorType);
- gTestStruct.fAtlas = GrDrawOpAtlas::Make(context->contextPriv().proxyProvider(),
+ context->priv().caps()->getBackendFormatFromColorType(kAlpha_8_SkColorType);
+ gTestStruct.fAtlas = GrDrawOpAtlas::Make(context->priv().proxyProvider(),
format, kAlpha_8_GrPixelConfig,
ATLAS_TEXTURE_WIDTH, ATLAS_TEXTURE_HEIGHT,
PLOT_WIDTH, PLOT_HEIGHT,
diff --git a/src/gpu/ops/GrStencilPathOp.cpp b/src/gpu/ops/GrStencilPathOp.cpp
index 0366d8c..7d913ea 100644
--- a/src/gpu/ops/GrStencilPathOp.cpp
+++ b/src/gpu/ops/GrStencilPathOp.cpp
@@ -21,7 +21,7 @@
bool hasStencilClip,
const GrScissorState& scissor,
const GrPath* path) {
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<GrStencilPathOp>(viewMatrix, useHWAA, fillType,
hasStencilClip, scissor, path);
diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp
index a31e695..4ebe9f6 100644
--- a/src/gpu/ops/GrTextureOp.cpp
+++ b/src/gpu/ops/GrTextureOp.cpp
@@ -107,7 +107,7 @@
SkCanvas::SrcRectConstraint constraint,
const SkMatrix& viewMatrix,
sk_sp<GrColorSpaceXform> textureColorSpaceXform) {
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
return pool->allocate<TextureOp>(
std::move(proxy), filter, color, srcRect, dstRect, aaType, aaFlags, constraint,
@@ -119,7 +119,7 @@
const SkMatrix& viewMatrix,
sk_sp<GrColorSpaceXform> textureColorSpaceXform) {
size_t size = sizeof(TextureOp) + sizeof(Proxy) * (cnt - 1);
- GrOpMemoryPool* pool = context->contextPriv().opMemoryPool();
+ GrOpMemoryPool* pool = context->priv().opMemoryPool();
void* mem = pool->allocate(size);
return std::unique_ptr<GrDrawOp>(new (mem) TextureOp(set, cnt, filter, aaType, viewMatrix,
std::move(textureColorSpaceXform)));
@@ -604,9 +604,9 @@
}
const GrBackendFormat format =
- context->contextPriv().caps()->getBackendFormatFromColorType(kRGBA_8888_SkColorType);
+ context->priv().caps()->getBackendFormatFromColorType(kRGBA_8888_SkColorType);
- GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider();
+ GrProxyProvider* proxyProvider = context->priv().proxyProvider();
sk_sp<GrTextureProxy> proxy = proxyProvider->createProxy(format, desc, origin, mipMapped, fit,
SkBudgeted::kNo,
GrInternalSurfaceFlags::kNone);
diff --git a/src/gpu/text/GrAtlasManager.cpp b/src/gpu/text/GrAtlasManager.cpp
index c1fbe3d..3b597a3 100644
--- a/src/gpu/text/GrAtlasManager.cpp
+++ b/src/gpu/text/GrAtlasManager.cpp
@@ -109,8 +109,7 @@
return false;
}
- sk_sp<GrSurfaceContext> sContext(context->contextPriv().makeWrappedSurfaceContext(
- sk_ref_sp(sProxy)));
+ sk_sp<GrSurfaceContext> sContext(context->priv().makeWrappedSurfaceContext(sk_ref_sp(sProxy)));
if (!sContext || !sContext->asTextureProxy()) {
return false;
}
diff --git a/src/gpu/text/GrTextContext.cpp b/src/gpu/text/GrTextContext.cpp
index 5169496..bf6b23980 100644
--- a/src/gpu/text/GrTextContext.cpp
+++ b/src/gpu/text/GrTextContext.cpp
@@ -216,10 +216,10 @@
}
const GrBackendFormat format =
- context->contextPriv().caps()->getBackendFormatFromColorType(kRGBA_8888_SkColorType);
+ context->priv().caps()->getBackendFormatFromColorType(kRGBA_8888_SkColorType);
// Setup dummy SkPaint / GrPaint / GrRenderTargetContext
- sk_sp<GrRenderTargetContext> rtc(context->contextPriv().makeDeferredRenderTargetContext(
+ sk_sp<GrRenderTargetContext> rtc(context->priv().makeDeferredRenderTargetContext(
format, SkBackingFit::kApprox, 1024, 1024, kRGBA_8888_GrPixelConfig, nullptr));
SkMatrix viewMatrix = GrTest::TestMatrixInvertible(random);
diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp
index 2f66805..28c7b2a 100644
--- a/src/gpu/vk/GrVkGpu.cpp
+++ b/src/gpu/vk/GrVkGpu.cpp
@@ -2391,7 +2391,7 @@
}
void GrVkGpu::storeVkPipelineCacheData() {
- if (this->getContext()->contextPriv().getPersistentCache()) {
+ if (this->getContext()->priv().getPersistentCache()) {
this->resourceProvider().storePipelineCacheData();
}
}
diff --git a/src/gpu/vk/GrVkGpuCommandBuffer.cpp b/src/gpu/vk/GrVkGpuCommandBuffer.cpp
index dff99f2..33c4cd9 100644
--- a/src/gpu/vk/GrVkGpuCommandBuffer.cpp
+++ b/src/gpu/vk/GrVkGpuCommandBuffer.cpp
@@ -271,7 +271,7 @@
SkASSERT(!fRenderTarget);
SkASSERT(fCommandBufferInfos.empty());
SkASSERT(-1 == fCurrentCmdInfo);
- SkASSERT(fGpu == rt->getContext()->contextPriv().getGpu());
+ SkASSERT(fGpu == rt->getContext()->priv().getGpu());
SkASSERT(!fLastPipelineState);
this->INHERITED::set(rt, origin);
diff --git a/src/gpu/vk/GrVkPipelineStateBuilder.cpp b/src/gpu/vk/GrVkPipelineStateBuilder.cpp
index b6097df..400c1e9 100644
--- a/src/gpu/vk/GrVkPipelineStateBuilder.cpp
+++ b/src/gpu/vk/GrVkPipelineStateBuilder.cpp
@@ -222,7 +222,7 @@
SkASSERT(offset == dataLength);
- this->gpu()->getContext()->contextPriv().getPersistentCache()->store(
+ this->gpu()->getContext()->priv().getPersistentCache()->store(
*key,
*SkData::MakeWithoutCopy(data.get(), dataLength));
}
@@ -277,11 +277,11 @@
settings.fCaps = this->caps()->shaderCaps();
settings.fFlipY = this->origin() != kTopLeft_GrSurfaceOrigin;
settings.fSharpenTextures =
- this->gpu()->getContext()->contextPriv().options().fSharpenMipmappedTextures;
+ this->gpu()->getContext()->priv().options().fSharpenMipmappedTextures;
SkASSERT(!this->fragColorIsInOut());
sk_sp<SkData> cached;
- auto persistentCache = fGpu->getContext()->contextPriv().getPersistentCache();
+ auto persistentCache = fGpu->getContext()->priv().getPersistentCache();
if (persistentCache) {
sk_sp<SkData> key = SkData::MakeWithoutCopy(desc->asKey(), desc->shaderKeyLength());
cached = persistentCache->load(*key);
diff --git a/src/gpu/vk/GrVkResourceProvider.cpp b/src/gpu/vk/GrVkResourceProvider.cpp
index 042cbc9..e232e4e 100644
--- a/src/gpu/vk/GrVkResourceProvider.cpp
+++ b/src/gpu/vk/GrVkResourceProvider.cpp
@@ -44,7 +44,7 @@
createInfo.pNext = nullptr;
createInfo.flags = 0;
- auto persistentCache = fGpu->getContext()->contextPriv().getPersistentCache();
+ auto persistentCache = fGpu->getContext()->priv().getPersistentCache();
sk_sp<SkData> cached;
if (persistentCache) {
uint32_t key = GrVkGpu::kPipelineCache_PersistentCacheKeyType;
@@ -386,7 +386,7 @@
}
void GrVkResourceProvider::destroyResources(bool deviceLost) {
- SkTaskGroup* taskGroup = fGpu->getContext()->contextPriv().getTaskGroup();
+ SkTaskGroup* taskGroup = fGpu->getContext()->priv().getTaskGroup();
if (taskGroup) {
taskGroup->wait();
}
@@ -447,7 +447,7 @@
}
void GrVkResourceProvider::abandonResources() {
- SkTaskGroup* taskGroup = fGpu->getContext()->contextPriv().getTaskGroup();
+ SkTaskGroup* taskGroup = fGpu->getContext()->priv().getTaskGroup();
if (taskGroup) {
taskGroup->wait();
}
@@ -509,7 +509,7 @@
void GrVkResourceProvider::backgroundReset(GrVkCommandPool* pool) {
SkASSERT(pool->unique());
pool->releaseResources(fGpu);
- SkTaskGroup* taskGroup = fGpu->getContext()->contextPriv().getTaskGroup();
+ SkTaskGroup* taskGroup = fGpu->getContext()->priv().getTaskGroup();
if (taskGroup) {
taskGroup->add([this, pool]() {
this->reset(pool);
@@ -544,7 +544,7 @@
uint32_t key = GrVkGpu::kPipelineCache_PersistentCacheKeyType;
sk_sp<SkData> keyData = SkData::MakeWithoutCopy(&key, sizeof(uint32_t));
- fGpu->getContext()->contextPriv().getPersistentCache()->store(
+ fGpu->getContext()->priv().getPersistentCache()->store(
*keyData, *SkData::MakeWithoutCopy(data.get(), dataSize));
}
diff --git a/src/gpu/vk/GrVkSecondaryCBDrawContext.cpp b/src/gpu/vk/GrVkSecondaryCBDrawContext.cpp
index 35d6353..7618141 100644
--- a/src/gpu/vk/GrVkSecondaryCBDrawContext.cpp
+++ b/src/gpu/vk/GrVkSecondaryCBDrawContext.cpp
@@ -28,7 +28,7 @@
}
sk_sp<GrRenderTargetContext> rtc(
- ctx->contextPriv().makeVulkanSecondaryCBRenderTargetContext(imageInfo, vkInfo, props));
+ ctx->priv().makeVulkanSecondaryCBRenderTargetContext(imageInfo, vkInfo, props));
int width = rtc->width();
int height = rtc->height();
diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp
index ba8a132..9b91bc8 100644
--- a/src/image/SkImage_Gpu.cpp
+++ b/src/image/SkImage_Gpu.cpp
@@ -74,7 +74,7 @@
}
sk_sp<GrRenderTargetContext> renderTargetContext(
- fContext->contextPriv().makeDeferredRenderTargetContextWithFallback(
+ fContext->priv().makeDeferredRenderTargetContextWithFallback(
format, SkBackingFit::kExact, this->width(), this->height(),
SkColorType2GrPixelConfig(targetCT), nullptr));
if (!renderTargetContext) {
@@ -112,7 +112,7 @@
return nullptr;
}
- GrProxyProvider* proxyProvider = ctx->contextPriv().proxyProvider();
+ GrProxyProvider* proxyProvider = ctx->priv().proxyProvider();
sk_sp<GrTextureProxy> proxy =
proxyProvider->wrapBackendTexture(backendTex, origin, ownership, GrWrapCacheable::kNo,
kRead_GrIOType, releaseProc, releaseCtx);
@@ -142,7 +142,7 @@
const GrBackendTexture& tex, GrSurfaceOrigin origin,
SkColorType ct, SkAlphaType at,
sk_sp<SkColorSpace> cs) {
- if (!ctx || !ctx->contextPriv().resourceProvider()) {
+ if (!ctx || !ctx->priv().resourceProvider()) {
// We have a DDL context and we don't support adopted textures for them.
return nullptr;
}
@@ -171,7 +171,7 @@
}
desc.fSampleCnt = 1;
- GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider();
+ GrProxyProvider* proxyProvider = context->priv().proxyProvider();
sk_sp<GrTextureProxy> proxy = proxyProvider->createProxy(std::move(data), desc);
if (!proxy) {
@@ -224,11 +224,11 @@
const int height = imageSize.height();
const GrBackendFormat format =
- ctx->contextPriv().caps()->getBackendFormatFromColorType(kRGBA_8888_SkColorType);
+ ctx->priv().caps()->getBackendFormatFromColorType(kRGBA_8888_SkColorType);
// Needs to create a render target in order to draw to it for the yuv->rgb conversion.
sk_sp<GrRenderTargetContext> renderTargetContext(
- ctx->contextPriv().makeDeferredRenderTargetContext(
+ ctx->priv().makeDeferredRenderTargetContext(
format, SkBackingFit::kExact, width, height, kRGBA_8888_GrPixelConfig,
std::move(imageColorSpace), 1, GrMipMapped::kNo, imageOrigin));
if (!renderTargetContext) {
@@ -259,9 +259,9 @@
// Needs to create a render target with external texture
// in order to draw to it for the yuv->rgb conversion.
sk_sp<GrRenderTargetContext> renderTargetContext(
- ctx->contextPriv().makeBackendTextureRenderTargetContext(backendTextureCopy,
- imageOrigin, 1,
- std::move(imageColorSpace)));
+ ctx->priv().makeBackendTextureRenderTargetContext(backendTextureCopy,
+ imageOrigin, 1,
+ std::move(imageColorSpace)));
if (!renderTargetContext) {
return nullptr;
@@ -351,7 +351,7 @@
return nullptr;
}
if (uint32_t incumbentID = as_IB(this)->contextID()) {
- if (incumbentID != context->contextPriv().contextID()) {
+ if (incumbentID != context->priv().contextID()) {
return nullptr;
}
sk_sp<GrTextureProxy> proxy = as_IB(this)->asTextureProxyRef();
@@ -417,7 +417,7 @@
}
GrPixelConfig config =
- context->contextPriv().caps()->getConfigFromBackendFormat(backendFormat, colorType);
+ context->priv().caps()->getConfigFromBackendFormat(backendFormat, colorType);
if (config == kUnknown_GrPixelConfig) {
return nullptr;
}
@@ -444,11 +444,11 @@
}
// Some backends or drivers don't support (safely) moving resources between contexts
- if (!context || !context->contextPriv().caps()->crossContextTextureSupport()) {
+ if (!context || !context->priv().caps()->crossContextTextureSupport()) {
return codecImage;
}
- auto maxTextureSize = context->contextPriv().caps()->maxTextureSize();
+ auto maxTextureSize = context->priv().caps()->maxTextureSize();
if (limitToMaxTextureSize &&
(codecImage->width() > maxTextureSize || codecImage->height() > maxTextureSize)) {
SkAutoPixmapStorage pmap;
@@ -472,15 +472,15 @@
return codecImage;
}
- if (!proxy->instantiate(context->contextPriv().resourceProvider())) {
+ if (!proxy->instantiate(context->priv().resourceProvider())) {
return codecImage;
}
sk_sp<GrTexture> texture = sk_ref_sp(proxy->peekTexture());
// Flush any writes or uploads
- context->contextPriv().prepareSurfaceForExternalIO(proxy.get());
+ context->priv().prepareSurfaceForExternalIO(proxy.get());
- GrGpu* gpu = context->contextPriv().getGpu();
+ GrGpu* gpu = context->priv().getGpu();
sk_sp<GrSemaphore> sema = gpu->prepareTextureForCrossContextUsage(texture.get());
auto gen = GrBackendTextureImageGenerator::Make(std::move(texture), proxy->origin(),
@@ -496,20 +496,20 @@
SkColorSpace* dstColorSpace,
bool limitToMaxTextureSize) {
// Some backends or drivers don't support (safely) moving resources between contexts
- if (!context || !context->contextPriv().caps()->crossContextTextureSupport()) {
+ if (!context || !context->priv().caps()->crossContextTextureSupport()) {
return SkImage::MakeRasterCopy(originalPixmap);
}
// If we don't have access to the resource provider and gpu (i.e. in a DDL context) we will not
// be able to make everything needed for a GPU CrossContext image. Thus return a raster copy
// instead.
- if (!context->contextPriv().resourceProvider()) {
+ if (!context->priv().resourceProvider()) {
return SkImage::MakeRasterCopy(originalPixmap);
}
const SkPixmap* pixmap = &originalPixmap;
SkAutoPixmapStorage resized;
- int maxTextureSize = context->contextPriv().caps()->maxTextureSize();
+ int maxTextureSize = context->priv().caps()->maxTextureSize();
int maxDim = SkTMax(originalPixmap.width(), originalPixmap.height());
if (limitToMaxTextureSize && maxDim > maxTextureSize) {
float scale = static_cast<float>(maxTextureSize) / maxDim;
@@ -521,7 +521,7 @@
}
pixmap = &resized;
}
- GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider();
+ GrProxyProvider* proxyProvider = context->priv().proxyProvider();
// Turn the pixmap into a GrTextureProxy
sk_sp<GrTextureProxy> proxy;
if (buildMips) {
@@ -547,8 +547,8 @@
sk_sp<GrTexture> texture = sk_ref_sp(proxy->peekTexture());
// Flush any writes or uploads
- context->contextPriv().prepareSurfaceForExternalIO(proxy.get());
- GrGpu* gpu = context->contextPriv().getGpu();
+ context->priv().prepareSurfaceForExternalIO(proxy.get());
+ GrGpu* gpu = context->priv().getGpu();
sk_sp<GrSemaphore> sema = gpu->prepareTextureForCrossContextUsage(texture.get());
@@ -597,7 +597,7 @@
}
// Flush any pending IO on the texture.
- ctx->contextPriv().prepareSurfaceForExternalIO(as_IB(image)->peekProxy());
+ ctx->priv().prepareSurfaceForExternalIO(as_IB(image)->peekProxy());
SkASSERT(!texture->surfacePriv().hasPendingIO());
// We must make a copy of the image if the image is not unique, if the GrTexture owned by the
@@ -616,7 +616,7 @@
}
// Flush to ensure that the copy is completed before we return the texture.
- ctx->contextPriv().prepareSurfaceForExternalIO(as_IB(image)->peekProxy());
+ ctx->priv().prepareSurfaceForExternalIO(as_IB(image)->peekProxy());
SkASSERT(!texture->surfacePriv().hasPendingIO());
}
diff --git a/src/image/SkImage_GpuBase.cpp b/src/image/SkImage_GpuBase.cpp
index 54ef66a..9c86d29 100644
--- a/src/image/SkImage_GpuBase.cpp
+++ b/src/image/SkImage_GpuBase.cpp
@@ -33,7 +33,7 @@
#if GR_TEST_UTILS
void SkImage_GpuBase::resetContext(sk_sp<GrContext> newContext) {
- SkASSERT(fContext->contextPriv().contextID() == newContext->contextPriv().contextID());
+ SkASSERT(fContext->priv().contextID() == newContext->priv().contextID());
fContext = newContext;
}
#endif
@@ -54,18 +54,18 @@
if (!backendFormat.isValid()) {
return false;
}
- *config = ctx->contextPriv().caps()->getConfigFromBackendFormat(backendFormat, ct);
+ *config = ctx->priv().caps()->getConfigFromBackendFormat(backendFormat, ct);
return *config != kUnknown_GrPixelConfig;
}
//////////////////////////////////////////////////////////////////////////////////////////////////
uint32_t SkImage_GpuBase::contextID() const {
- return fContext->contextPriv().contextID();
+ return fContext->priv().contextID();
}
bool SkImage_GpuBase::getROPixels(SkBitmap* dst, CachingHint chint) const {
- if (!fContext->contextPriv().resourceProvider()) {
+ if (!fContext->priv().resourceProvider()) {
// DDL TODO: buffer up the readback so it occurs when the DDL is drawn?
return false;
}
@@ -90,7 +90,7 @@
}
}
- sk_sp<GrSurfaceContext> sContext = fContext->contextPriv().makeWrappedSurfaceContext(
+ sk_sp<GrSurfaceContext> sContext = fContext->priv().makeWrappedSurfaceContext(
this->asTextureProxyRef(),
fColorSpace);
if (!sContext) {
@@ -122,7 +122,7 @@
}
// TODO: Should this inherit our proxy's budgeted status?
- sk_sp<GrSurfaceContext> sContext(fContext->contextPriv().makeDeferredSurfaceContext(
+ sk_sp<GrSurfaceContext> sContext(fContext->priv().makeDeferredSurfaceContext(
format, desc, proxy->origin(), GrMipMapped::kNo, SkBackingFit::kExact,
proxy->isBudgeted()));
if (!sContext) {
@@ -162,7 +162,7 @@
bool SkImage_GpuBase::onReadPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRB,
int srcX, int srcY, CachingHint) const {
- if (!fContext->contextPriv().resourceProvider()) {
+ if (!fContext->priv().resourceProvider()) {
// DDL TODO: buffer up the readback so it occurs when the DDL is drawn?
return false;
}
@@ -184,7 +184,7 @@
flags = GrContextPriv::kUnpremul_PixelOpsFlag;
}
- sk_sp<GrSurfaceContext> sContext = fContext->contextPriv().makeWrappedSurfaceContext(
+ sk_sp<GrSurfaceContext> sContext = fContext->priv().makeWrappedSurfaceContext(
this->asTextureProxyRef(), fColorSpace);
if (!sContext) {
return false;
@@ -211,7 +211,7 @@
sk_sp<GrTextureProxy> SkImage_GpuBase::asTextureProxyRef(GrContext* context,
const GrSamplerState& params,
SkScalar scaleAdjust[2]) const {
- if (context->contextPriv().contextID() != fContext->contextPriv().contextID()) {
+ if (context->priv().contextID() != fContext->priv().contextID()) {
SkASSERT(0);
return nullptr;
}
@@ -226,12 +226,12 @@
sk_sp<GrTextureProxy> proxy = this->asTextureProxyRef();
SkASSERT(proxy);
- if (!fContext->contextPriv().resourceProvider() && !proxy->isInstantiated()) {
+ if (!fContext->priv().resourceProvider() && !proxy->isInstantiated()) {
// This image was created with a DDL context and cannot be instantiated.
return GrBackendTexture();
}
- if (!proxy->instantiate(fContext->contextPriv().resourceProvider())) {
+ if (!proxy->instantiate(fContext->priv().resourceProvider())) {
return GrBackendTexture(); // invalid
}
@@ -239,7 +239,7 @@
if (texture) {
if (flushPendingGrContextIO) {
- fContext->contextPriv().prepareSurfaceForExternalIO(proxy.get());
+ fContext->priv().prepareSurfaceForExternalIO(proxy.get());
}
if (origin) {
*origin = proxy->origin();
@@ -256,12 +256,12 @@
}
sk_sp<GrTextureProxy> proxyRef = this->asTextureProxyRef();
- if (!fContext->contextPriv().resourceProvider() && !proxyRef->isInstantiated()) {
+ if (!fContext->priv().resourceProvider() && !proxyRef->isInstantiated()) {
// This image was created with a DDL context and cannot be instantiated.
return nullptr;
}
- if (!proxy->instantiate(fContext->contextPriv().resourceProvider())) {
+ if (!proxy->instantiate(fContext->priv().resourceProvider())) {
return nullptr;
}
@@ -285,7 +285,7 @@
int numTextures, const SkYUVAIndex yuvaIndices[4],
GrSurfaceOrigin imageOrigin,
sk_sp<GrTextureProxy> tempTextureProxies[4]) {
- GrProxyProvider* proxyProvider = ctx->contextPriv().proxyProvider();
+ GrProxyProvider* proxyProvider = ctx->priv().proxyProvider();
// We need to make a copy of the input backend textures because we need to preserve the result
// of validate_backend_texture.
@@ -297,7 +297,7 @@
return false;
}
yuvaTexturesCopy[textureIndex].fConfig =
- ctx->contextPriv().caps()->getYUVAConfigFromBackendFormat(backendFormat);
+ ctx->priv().caps()->getYUVAConfigFromBackendFormat(backendFormat);
if (yuvaTexturesCopy[textureIndex].fConfig == kUnknown_GrPixelConfig) {
return false;
}
@@ -360,7 +360,7 @@
renderTargetContext->drawRect(GrNoClip(), std::move(paint), GrAA::kNo, SkMatrix::I(), rect);
// DDL TODO: in the promise image version we must not flush here
- ctx->contextPriv().flushSurfaceWrites(renderTargetContext->asSurfaceProxy());
+ ctx->priv().flushSurfaceWrites(renderTargetContext->asSurfaceProxy());
return true;
}
@@ -509,8 +509,8 @@
}
tex->resourcePriv().setUniqueKey(fLastFulfilledKey);
SkASSERT(fContextID == SK_InvalidUniqueID ||
- fContextID == tex->getContext()->contextPriv().contextID());
- fContextID = tex->getContext()->contextPriv().contextID();
+ fContextID == tex->getContext()->priv().contextID());
+ fContextID = tex->getContext()->priv().contextID();
promiseTexture->addKeyToInvalidate(fContextID, fLastFulfilledKey);
return std::move(tex);
}
@@ -602,7 +602,7 @@
GrUniqueKey fLastFulfilledKey;
} callback(fulfillProc, releaseProc, doneProc, textureContext, delayReleaseCallback, config);
- GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider();
+ GrProxyProvider* proxyProvider = context->priv().proxyProvider();
GrSurfaceDesc desc;
desc.fWidth = width;
diff --git a/src/image/SkImage_GpuYUVA.cpp b/src/image/SkImage_GpuYUVA.cpp
index 9b44a3e..3c4fda4 100644
--- a/src/image/SkImage_GpuYUVA.cpp
+++ b/src/image/SkImage_GpuYUVA.cpp
@@ -82,7 +82,7 @@
for (int i = 0; i < fNumProxies; ++i) {
GrTextureProducer::CopyParams copyParams;
int mipCount = SkMipMap::ComputeLevelCount(fProxies[i]->width(), fProxies[i]->height());
- if (mipCount && GrGpu::IsACopyNeededForMips(fContext->contextPriv().caps(),
+ if (mipCount && GrGpu::IsACopyNeededForMips(fContext->priv().caps(),
fProxies[i].get(),
GrSamplerState::Filter::kMipMap,
©Params)) {
@@ -101,11 +101,11 @@
sk_sp<GrTextureProxy> SkImage_GpuYUVA::asTextureProxyRef() const {
if (!fRGBProxy) {
const GrBackendFormat format =
- fContext->contextPriv().caps()->getBackendFormatFromColorType(kRGBA_8888_SkColorType);
+ fContext->priv().caps()->getBackendFormatFromColorType(kRGBA_8888_SkColorType);
// Needs to create a render target in order to draw to it for the yuv->rgb conversion.
sk_sp<GrRenderTargetContext> renderTargetContext(
- fContext->contextPriv().makeDeferredRenderTargetContext(
+ fContext->priv().makeDeferredRenderTargetContext(
format, SkBackingFit::kExact, this->width(), this->height(),
kRGBA_8888_GrPixelConfig, fColorSpace, 1, GrMipMapped::kNo, fOrigin));
if (!renderTargetContext) {
@@ -195,12 +195,12 @@
}
// Make proxies
- GrProxyProvider* proxyProvider = context->contextPriv().proxyProvider();
+ GrProxyProvider* proxyProvider = context->priv().proxyProvider();
sk_sp<GrTextureProxy> tempTextureProxies[4];
for (int i = 0; i < numPixmaps; ++i) {
const SkPixmap* pixmap = &yuvaPixmaps[i];
SkAutoPixmapStorage resized;
- int maxTextureSize = context->contextPriv().caps()->maxTextureSize();
+ int maxTextureSize = context->priv().caps()->maxTextureSize();
int maxDim = SkTMax(yuvaPixmaps[i].width(), yuvaPixmaps[i].height());
if (limitToMaxTextureSize && maxDim > maxTextureSize) {
float scale = static_cast<float>(maxTextureSize) / maxDim;
@@ -314,7 +314,7 @@
sk_sp<GrTextureProxy> proxies[4];
for (int texIdx = 0; texIdx < numTextures; ++texIdx) {
GrPixelConfig config =
- context->contextPriv().caps()->getYUVAConfigFromBackendFormat(yuvaFormats[texIdx]);
+ context->priv().caps()->getYUVAConfigFromBackendFormat(yuvaFormats[texIdx]);
if (config == kUnknown_GrPixelConfig) {
return nullptr;
}
diff --git a/src/image/SkImage_Lazy.cpp b/src/image/SkImage_Lazy.cpp
index 682db3a..47bf690 100644
--- a/src/image/SkImage_Lazy.cpp
+++ b/src/image/SkImage_Lazy.cpp
@@ -389,7 +389,7 @@
GrUniqueKey key;
this->makeCacheKeyFromOrigKey(origKey, &key);
- GrProxyProvider* proxyProvider = ctx->contextPriv().proxyProvider();
+ GrProxyProvider* proxyProvider = ctx->priv().proxyProvider();
sk_sp<GrTextureProxy> proxy;
// 1. Check the cache for a pre-existing one
@@ -417,7 +417,7 @@
set_key_on_proxy(proxyProvider, proxy.get(), nullptr, key);
if (!willBeMipped || GrMipMapped::kYes == proxy->mipMapped()) {
*fUniqueKeyInvalidatedMessages.append() =
- new GrUniqueKeyInvalidatedMessage(key, ctx->contextPriv().contextID());
+ new GrUniqueKeyInvalidatedMessage(key, ctx->priv().contextID());
return proxy;
}
}
@@ -425,12 +425,12 @@
// 3. Ask the generator to return YUV planes, which the GPU can convert. If we will be mipping
// the texture we fall through here and have the CPU generate the mip maps for us.
- if (!proxy && !willBeMipped && !ctx->contextPriv().options().fDisableGpuYUVConversion) {
+ if (!proxy && !willBeMipped && !ctx->priv().options().fDisableGpuYUVConversion) {
const GrSurfaceDesc desc = GrImageInfoToSurfaceDesc(fInfo);
SkColorType colorType = fInfo.colorType();
GrBackendFormat format =
- ctx->contextPriv().caps()->getBackendFormatFromColorType(colorType);
+ ctx->priv().caps()->getBackendFormatFromColorType(colorType);
ScopedGenerator generator(fSharedGenerator);
Generator_GrYUVProvider provider(generator);
@@ -450,7 +450,7 @@
kLockTexturePathCount);
set_key_on_proxy(proxyProvider, proxy.get(), nullptr, key);
*fUniqueKeyInvalidatedMessages.append() =
- new GrUniqueKeyInvalidatedMessage(key, ctx->contextPriv().contextID());
+ new GrUniqueKeyInvalidatedMessage(key, ctx->priv().contextID());
return proxy;
}
}
@@ -469,7 +469,7 @@
kLockTexturePathCount);
set_key_on_proxy(proxyProvider, proxy.get(), nullptr, key);
*fUniqueKeyInvalidatedMessages.append() =
- new GrUniqueKeyInvalidatedMessage(key, ctx->contextPriv().contextID());
+ new GrUniqueKeyInvalidatedMessage(key, ctx->priv().contextID());
return proxy;
}
}
@@ -482,7 +482,7 @@
SkASSERT(willBeMipped);
SkASSERT(GrMipMapped::kNo == proxy->mipMapped());
*fUniqueKeyInvalidatedMessages.append() =
- new GrUniqueKeyInvalidatedMessage(key, ctx->contextPriv().contextID());
+ new GrUniqueKeyInvalidatedMessage(key, ctx->priv().contextID());
if (auto mippedProxy = GrCopyBaseMipMapToTextureProxy(ctx, proxy.get())) {
set_key_on_proxy(proxyProvider, mippedProxy.get(), proxy.get(), key);
return mippedProxy;
diff --git a/src/image/SkSurface_Gpu.cpp b/src/image/SkSurface_Gpu.cpp
index 8890382..89959f1 100644
--- a/src/image/SkSurface_Gpu.cpp
+++ b/src/image/SkSurface_Gpu.cpp
@@ -261,7 +261,7 @@
GrRenderTargetContext* rtc = fDevice->accessRenderTargetContext();
GrContext* ctx = fDevice->context();
- ctx->contextPriv().copyOpListsFromDDL(ddl, rtc->asRenderTargetProxy());
+ ctx->priv().copyOpListsFromDDL(ddl, rtc->asRenderTargetProxy());
return true;
}
@@ -294,7 +294,7 @@
return nullptr;
}
- if (!SkSurface_Gpu::Valid(context->contextPriv().caps(), c.config(), c.colorSpace())) {
+ if (!SkSurface_Gpu::Valid(context->priv().caps(), c.config(), c.colorSpace())) {
return nullptr;
}
@@ -308,14 +308,14 @@
desc.fSampleCnt = c.stencilCount();
const GrBackendFormat format =
- context->contextPriv().caps()->getBackendFormatFromColorType(c.colorType());
+ context->priv().caps()->getBackendFormatFromColorType(c.colorType());
sk_sp<GrSurfaceContext> sc(
- context->contextPriv().makeDeferredSurfaceContext(format, desc, c.origin(),
- GrMipMapped(c.isMipMapped()),
- SkBackingFit::kExact, budgeted,
- c.refColorSpace(),
- &c.surfaceProps()));
+ context->priv().makeDeferredSurfaceContext(format, desc, c.origin(),
+ GrMipMapped(c.isMipMapped()),
+ SkBackingFit::kExact, budgeted,
+ c.refColorSpace(),
+ &c.surfaceProps()));
if (!sc || !sc->asRenderTargetContext()) {
return nullptr;
}
@@ -352,7 +352,7 @@
sampleCount = SkTMax(1, sampleCount);
GrMipMapped mipMapped = shouldCreateWithMips ? GrMipMapped::kYes : GrMipMapped::kNo;
- if (!ctx->contextPriv().caps()->mipMapSupport()) {
+ if (!ctx->priv().caps()->mipMapSupport()) {
mipMapped = GrMipMapped::kNo;
}
@@ -400,18 +400,18 @@
if (!backendFormat.isValid()) {
return false;
}
- *config = ctx->contextPriv().caps()->getConfigFromBackendFormat(backendFormat, ct);
+ *config = ctx->priv().caps()->getConfigFromBackendFormat(backendFormat, ct);
if (*config == kUnknown_GrPixelConfig) {
return false;
}
// We don't require that the client gave us an exact valid sample cnt. However, it must be
// less than the max supported sample count and 1 if MSAA is unsupported for the color type.
- if (!ctx->contextPriv().caps()->getRenderTargetSampleCount(sampleCnt, *config)) {
+ if (!ctx->priv().caps()->getRenderTargetSampleCount(sampleCnt, *config)) {
return false;
}
- if (texturable && !ctx->contextPriv().caps()->isConfigTexturable(*config)) {
+ if (texturable && !ctx->priv().caps()->isConfigTexturable(*config)) {
return false;
}
return true;
@@ -435,12 +435,12 @@
if (!context) {
return nullptr;
}
- if (!SkSurface_Gpu::Valid(context->contextPriv().caps(), texCopy.config(), colorSpace.get())) {
+ if (!SkSurface_Gpu::Valid(context->priv().caps(), texCopy.config(), colorSpace.get())) {
return nullptr;
}
sampleCnt = SkTMax(1, sampleCnt);
- sk_sp<GrRenderTargetContext> rtc(context->contextPriv().makeBackendTextureRenderTargetContext(
+ sk_sp<GrRenderTargetContext> rtc(context->priv().makeBackendTextureRenderTargetContext(
texCopy,
origin,
sampleCnt,
@@ -469,16 +469,16 @@
return false;
}
- *config = ctx->contextPriv().caps()->validateBackendRenderTarget(rt, ct);
+ *config = ctx->priv().caps()->validateBackendRenderTarget(rt, ct);
if (*config == kUnknown_GrPixelConfig) {
return false;
}
if (rt.sampleCnt() > 1) {
- if (ctx->contextPriv().caps()->maxRenderTargetSampleCount(*config) <= 1) {
+ if (ctx->priv().caps()->maxRenderTargetSampleCount(*config) <= 1) {
return false;
}
- } else if (!ctx->contextPriv().caps()->isConfigRenderable(*config)) {
+ } else if (!ctx->priv().caps()->isConfigRenderable(*config)) {
return false;
}
@@ -499,7 +499,7 @@
if (!validate_backend_render_target(context, rtCopy, &rtCopy.fConfig, colorType, colorSpace)) {
return nullptr;
}
- if (!SkSurface_Gpu::Valid(context->contextPriv().caps(), rtCopy.config(), colorSpace.get())) {
+ if (!SkSurface_Gpu::Valid(context->priv().caps(), rtCopy.config(), colorSpace.get())) {
return nullptr;
}
@@ -508,7 +508,7 @@
}
sk_sp<GrRenderTargetContext> rtc(
- context->contextPriv().makeBackendRenderTargetRenderTargetContext(
+ context->priv().makeBackendRenderTargetRenderTargetContext(
rtCopy, origin, std::move(colorSpace), props));
if (!rtc) {
return nullptr;
@@ -542,12 +542,12 @@
return nullptr;
}
- if (!SkSurface_Gpu::Valid(context->contextPriv().caps(), texCopy.config(), colorSpace.get())) {
+ if (!SkSurface_Gpu::Valid(context->priv().caps(), texCopy.config(), colorSpace.get())) {
return nullptr;
}
sk_sp<GrRenderTargetContext> rtc(
- context->contextPriv().makeBackendTextureAsRenderTargetRenderTargetContext(
+ context->priv().makeBackendTextureAsRenderTargetRenderTargetContext(
texCopy,
origin,
sampleCnt,
diff --git a/src/shaders/SkImageShader.cpp b/src/shaders/SkImageShader.cpp
index bb56061..c1d14d8 100644
--- a/src/shaders/SkImageShader.cpp
+++ b/src/shaders/SkImageShader.cpp
@@ -196,7 +196,7 @@
// clamp-to-border is reset to clamp since the hw cannot implement it directly.
GrTextureDomain::Mode domainX = GrTextureDomain::kIgnore_Mode;
GrTextureDomain::Mode domainY = GrTextureDomain::kIgnore_Mode;
- if (!args.fContext->contextPriv().caps()->clampToBorderSupport()) {
+ if (!args.fContext->priv().caps()->clampToBorderSupport()) {
if (wrapModes[0] == GrSamplerState::WrapMode::kClampToBorder) {
domainX = GrTextureDomain::kDecal_Mode;
wrapModes[0] = GrSamplerState::WrapMode::kClamp;
@@ -214,7 +214,7 @@
bool doBicubic;
GrSamplerState::Filter textureFilterMode = GrSkFilterQualityToGrFilterMode(
args.fFilterQuality, *args.fViewMatrix, *lm,
- args.fContext->contextPriv().options().fSharpenMipmappedTextures, &doBicubic);
+ args.fContext->priv().options().fSharpenMipmappedTextures, &doBicubic);
GrSamplerState samplerState(wrapModes, textureFilterMode);
SkScalar scaleAdjust[2] = { 1.0f, 1.0f };
sk_sp<GrTextureProxy> proxy(as_IB(fImage)->asTextureProxyRef(args.fContext, samplerState,
diff --git a/src/shaders/SkPerlinNoiseShader.cpp b/src/shaders/SkPerlinNoiseShader.cpp
index 5f4f452..011ced8 100644
--- a/src/shaders/SkPerlinNoiseShader.cpp
+++ b/src/shaders/SkPerlinNoiseShader.cpp
@@ -1423,7 +1423,7 @@
m.setTranslateX(-localMatrix->getTranslateX() + SK_Scalar1);
m.setTranslateY(-localMatrix->getTranslateY() + SK_Scalar1);
- auto proxyProvider = args.fContext->contextPriv().proxyProvider();
+ auto proxyProvider = args.fContext->priv().proxyProvider();
if (fType == kImprovedNoise_Type) {
// Need to assert that the textures we'll create are power of 2 so a copy isn't needed.
// We also know that we will not be using mipmaps. If things things weren't true we should
diff --git a/src/shaders/SkPictureShader.cpp b/src/shaders/SkPictureShader.cpp
index 1601ab9..d14d5a4 100644
--- a/src/shaders/SkPictureShader.cpp
+++ b/src/shaders/SkPictureShader.cpp
@@ -332,7 +332,7 @@
const GrFPArgs& args) const {
int maxTextureSize = 0;
if (args.fContext) {
- maxTextureSize = args.fContext->contextPriv().caps()->maxTextureSize();
+ maxTextureSize = args.fContext->priv().caps()->maxTextureSize();
}
auto lm = this->totalLocalMatrix(args.fPreLocalMatrix, args.fPostLocalMatrix);