diff options
| author |  bsalomon <bsalomon@google.com> | 2016-05-11 06:33:06 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-11 06:33:06 -0700 |
| commit | 8b7451aaf6b1c71e9d343a4df107893db277b6aa (patch) | |
| tree | b1416c3e9a154a74ff004135d41b5eefd68c0ed9 /tests/ProxyTest.cpp | |
| parent | 70142347f7b4ef49745e828d93026fc153a72845 (diff) | |
Turn ContextInfos returned by GrContextFactory into structs.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1966013002
Review-Url: https://codereview.chromium.org/1966013002
Diffstat (limited to 'tests/ProxyTest.cpp')
| -rw-r--r-- | tests/ProxyTest.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/ProxyTest.cpp b/tests/ProxyTest.cpp index e1e5aeb2cf..5f27b89f5a 100644 --- a/tests/ProxyTest.cpp +++ b/tests/ProxyTest.cpp @@ -76,7 +76,7 @@ static void check_texture(skiatest::Reporter* reporter, DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(AllocedProxyTest, reporter, ctxInfo) { - GrTextureProvider* provider = ctxInfo.fGrContext->textureProvider(); + GrTextureProvider* provider = ctxInfo.grContext()->textureProvider(); for (auto origin : { kBottomLeft_GrSurfaceOrigin, kTopLeft_GrSurfaceOrigin }) { for (auto widthHeight : { 100, 128 }) { @@ -84,9 +84,9 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(AllocedProxyTest, reporter, ctxInfo) { for (auto fit : { SkBackingFit::kExact, SkBackingFit::kApprox }) { for (auto budgeted : { SkBudgeted::kYes, SkBudgeted::kNo }) { for (auto numSamples : { 0, 4}) { - bool renderable = ctxInfo.fGrContext->caps()->isConfigRenderable( + bool renderable = ctxInfo.grContext()->caps()->isConfigRenderable( config, numSamples > 0) && - numSamples <= ctxInfo.fGrContext->caps()->maxColorSampleCount(); + numSamples <= ctxInfo.grContext()->caps()->maxColorSampleCount(); GrSurfaceDesc desc; desc.fOrigin = origin; @@ -97,7 +97,7 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(AllocedProxyTest, reporter, ctxInfo) { if (renderable) { sk_sp<GrRenderTargetProxy> rtProxy(GrRenderTargetProxy::Make( - *ctxInfo.fGrContext->caps(), + *ctxInfo.grContext()->caps(), desc, fit, budgeted)); @@ -123,7 +123,7 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(AllocedProxyTest, reporter, ctxInfo) { } DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(WrappedProxyTest, reporter, ctxInfo) { - GrTextureProvider* provider = ctxInfo.fGrContext->textureProvider(); + GrTextureProvider* provider = ctxInfo.grContext()->textureProvider(); static const int kWidthHeight = 100; @@ -131,7 +131,7 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(WrappedProxyTest, reporter, ctxInfo) { for (auto config : { kAlpha_8_GrPixelConfig, kRGBA_8888_GrPixelConfig }) { for (auto budgeted : { SkBudgeted::kYes, SkBudgeted::kNo }) { for (auto numSamples: { 0, 4}) { - bool renderable = ctxInfo.fGrContext->caps()->isConfigRenderable( + bool renderable = ctxInfo.grContext()->caps()->isConfigRenderable( config, numSamples > 0); GrSurfaceDesc desc; |