Make GrCaps and GrShaderCaps private.
Moves getCaps() from GrContext to GrContextPriv and removes unused refCaps().
Change-Id: Ic6a8951b656c0d1b2773eae73bff8e88af819866
Reviewed-on: https://skia-review.googlesource.com/127389
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp
index 679dc8a..b69dd2e 100644
--- a/tests/ImageTest.cpp
+++ b/tests/ImageTest.cpp
@@ -850,7 +850,7 @@
// If we don't have proper support for this feature, the factory will fallback to returning
// codec-backed images. Those will "work", but some of our checks will fail because we
// expect the cross-context images not to work on multiple contexts at once.
- if (!ctx->caps()->crossContextTextureSupport()) {
+ if (!ctx->contextPriv().caps()->crossContextTextureSupport()) {
continue;
}
@@ -1026,7 +1026,7 @@
GrContextFactory::ContextType ctxType = static_cast<GrContextFactory::ContextType>(i);
ContextInfo ctxInfo = testFactory.getContextInfo(ctxType);
GrContext* ctx = ctxInfo.grContext();
- if (!ctx || !ctx->caps()->crossContextTextureSupport()) {
+ if (!ctx || !ctx->contextPriv().caps()->crossContextTextureSupport()) {
continue;
}
@@ -1055,7 +1055,7 @@
testContext->makeCurrent();
REPORTER_ASSERT(reporter, proxy);
auto createLarge = [context] {
- return create_image_large(context->caps()->maxTextureSize());
+ return create_image_large(context->contextPriv().caps()->maxTextureSize());
};
struct {
std::function<sk_sp<SkImage> ()> fImageFactory;