diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-07-27 16:16:25 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-27 22:16:06 +0000 |
| commit | 16d8ec66cdce2f30ce89b87066d3ac7a244c460d (patch) | |
| tree | c1428954ad363f7e2b6ce13bbb1640911c7a8262 /tests/TransferPixelsTest.cpp | |
| parent | 713195071dc7bdeddec2d1c9fab9b3720f049f07 (diff) | |
Pull non-substantive changes out of omnibus GrSurface CL
https://skia-review.googlesource.com/c/26363 (Remove origin field from GrSurface) is
already too large. This pulls some of the cosmetic changes out for separate review.
Change-Id: I1d8b95522144b2f4cbd916ef38faa3dde6f78087
Reviewed-on: https://skia-review.googlesource.com/27840
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tests/TransferPixelsTest.cpp')
| -rwxr-xr-x | tests/TransferPixelsTest.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/TransferPixelsTest.cpp b/tests/TransferPixelsTest.cpp index 5da292f11e..daeaadad08 100755 --- a/tests/TransferPixelsTest.cpp +++ b/tests/TransferPixelsTest.cpp @@ -92,11 +92,11 @@ void basic_transfer_test(skiatest::Reporter* reporter, GrContext* context, GrPix // create texture GrSurfaceDesc desc; - desc.fConfig = config; desc.fFlags = renderTarget ? kRenderTarget_GrSurfaceFlag : kNone_GrSurfaceFlags; desc.fOrigin = origin; desc.fWidth = kTextureWidth; desc.fHeight = kTextureHeight; + desc.fConfig = config; desc.fSampleCnt = 0; sk_sp<GrTexture> tex = context->resourceProvider()->createTexture(desc, SkBudgeted::kNo); @@ -109,8 +109,8 @@ void basic_transfer_test(skiatest::Reporter* reporter, GrContext* context, GrPix REPORTER_ASSERT(reporter, result); memset(dstBuffer.get(), 0xCDCD, size); - result = context->getGpu()->readPixels(tex.get(), 0, 0, kTextureWidth, kTextureHeight, config, - dstBuffer.get(), rowBytes); + result = context->getGpu()->readPixels(tex.get(), 0, 0, kTextureWidth, kTextureHeight, + config, dstBuffer.get(), rowBytes); if (result) { REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_values(srcBuffer, dstBuffer, @@ -120,7 +120,7 @@ void basic_transfer_test(skiatest::Reporter* reporter, GrContext* context, GrPix kBufferHeight, origin)); } - + ////////////////////////// // transfer partial data @@ -141,8 +141,8 @@ void basic_transfer_test(skiatest::Reporter* reporter, GrContext* context, GrPix REPORTER_ASSERT(reporter, result); memset(dstBuffer.get(), 0xCDCD, size); - result = context->getGpu()->readPixels(tex.get(), 0, 0, kTextureWidth, kTextureHeight, config, - dstBuffer.get(), rowBytes); + result = context->getGpu()->readPixels(tex.get(), 0, 0, kTextureWidth, kTextureHeight, + config, dstBuffer.get(), rowBytes); if (result) { REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_values(srcBuffer, dstBuffer, |