diff options
| author |  bsalomon <bsalomon@google.com> | 2015-05-28 08:20:58 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-05-28 08:20:58 -0700 |
| commit | 084d1b61bca3b9e246cdf26377c373744ab6411c (patch) | |
| tree | ddbe73e7823816eed36ca9989739e4ec86f96dbe /tests/ResourceCacheTest.cpp | |
| parent | 9138c46e572085870638b6f7ad7fcdfcdf3cac99 (diff) | |
Revert of Add direct getter for GrCaps to GrContext. (patchset #4 id:60001 of https://codereview.chromium.org/1149773005/)
Reason for revert:
Breaking
Original issue's description:
> Add direct getter for GrCaps to GrContext.
>
> TBR=joshualitt@google.com
>
> Committed: https://skia.googlesource.com/skia/+/9138c46e572085870638b6f7ad7fcdfcdf3cac99
TBR=joshualitt@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1164443002
Diffstat (limited to 'tests/ResourceCacheTest.cpp')
| -rw-r--r-- | tests/ResourceCacheTest.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp index b9632ef8ba..71fb4e38b1 100644 --- a/tests/ResourceCacheTest.cpp +++ b/tests/ResourceCacheTest.cpp @@ -122,7 +122,7 @@ static void test_stencil_buffers(skiatest::Reporter* reporter, GrContext* contex smallRT0->asRenderTarget()->renderTargetPriv().getStencilAttachment() != bigRT->asRenderTarget()->renderTargetPriv().getStencilAttachment()); - if (context->caps()->maxSampleCount() >= 4) { + if (context->getMaxSampleCount() >= 4) { // An RT with a different sample count should not share. GrSurfaceDesc smallMSAADesc = smallDesc; smallMSAADesc.fSampleCnt = 4; @@ -154,8 +154,7 @@ static void test_stencil_buffers(skiatest::Reporter* reporter, GrContext* contex smallMSAART1->asRenderTarget()->renderTargetPriv().getStencilAttachment()); // But not one with a larger sample count should not. (Also check that the request for 4 // samples didn't get rounded up to >= 8 or else they could share.). - if (context->caps()->maxSampleCount() >= 8 && - smallMSAART0 && smallMSAART0->asRenderTarget() && + if (context->getMaxSampleCount() >= 8 && smallMSAART0 && smallMSAART0->asRenderTarget() && smallMSAART0->asRenderTarget()->numSamples() < 8) { smallMSAADesc.fSampleCnt = 8; smallMSAART1.reset(cache->createTexture(smallMSAADesc, false)); |