Skip to content

Commit 28a8f28

Browse files
bsalomonSkia Commit-Bot
bsalomon
authored and
Skia Commit-Bot
committed
Rename functions in TestUtils.h
Change-Id: Iaa8a4ac57e967c6429473fb3a738d377a47fc2c7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/250799 Commit-Queue: Brian Salomon <bsalomon@google.com> Auto-Submit: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
1 parent 342fbc5 commit 28a8f28

18 files changed

Lines changed: 152 additions & 151 deletions

‎dm/DMSrcSink.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,14 +1303,14 @@ static Error compare_bitmaps(const SkBitmap& reference, const SkBitmap& bitmap)
13031303
if (0 != memcmp(reference.getPixels(), bitmap.getPixels(), reference.computeByteSize())) {
13041304
SkString encoded;
13051305
SkString errString("Pixels don't match reference");
1306-
if (bitmap_to_base64_data_uri(reference, &encoded)) {
1306+
if (BipmapToBase64DataURI(reference, &encoded)) {
13071307
errString.append("\nExpected: ");
13081308
errString.append(encoded);
13091309
} else {
13101310
errString.append("\nExpected image failed to encode: ");
13111311
errString.append(encoded);
13121312
}
1313-
if (bitmap_to_base64_data_uri(bitmap, &encoded)) {
1313+
if (BipmapToBase64DataURI(bitmap, &encoded)) {
13141314
errString.append("\nActual: ");
13151315
errString.append(encoded);
13161316
} else {

‎tests/BackendAllocationTest.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ static void check_solid_pixmap(skiatest::Reporter* reporter,
171171
diffs[0], diffs[1], diffs[2], diffs[3]);
172172
});
173173

174-
check_solid_pixels(expected, actual, tols, error);
174+
CheckSolidPixels(expected, actual, tols, error);
175175
}
176176

177177
// What would raster do?

‎tests/DeferredDisplayListTest.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -880,8 +880,8 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(DDLSkSurfaceFlush, reporter, ctxInfo) {
880880

881881
GrBackendTexture backendTexture;
882882

883-
if (!create_backend_texture(context, &backendTexture, ii, SkColors::kCyan,
884-
GrMipMapped::kNo, GrRenderable::kNo)) {
883+
if (!CreateBackendTexture(context, &backendTexture, ii, SkColors::kCyan, GrMipMapped::kNo,
884+
GrRenderable::kNo)) {
885885
REPORTER_ASSERT(reporter, false);
886886
return;
887887
}
@@ -940,7 +940,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(DDLSkSurfaceFlush, reporter, ctxInfo) {
940940
REPORTER_ASSERT(reporter, fulfillInfo.fTex->unique());
941941
fulfillInfo.fTex.reset();
942942

943-
delete_backend_texture(context, backendTexture);
943+
DeleteBackendTexture(context, backendTexture);
944944
}
945945

946946
////////////////////////////////////////////////////////////////////////////////

‎tests/EGLImageTest.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,15 +185,15 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(EGLImageTest, reporter, ctxInfo) {
185185
}
186186
}
187187

188-
test_read_pixels(reporter, surfaceContext.get(), pixels.get(), "EGLImageTest-read");
188+
TestReadPixels(reporter, surfaceContext.get(), pixels.get(), "EGLImageTest-read");
189189

190190
// We should not be able to write to a EXTERNAL texture
191-
test_write_pixels(reporter, surfaceContext.get(), false, "EGLImageTest-write");
191+
TestWritePixels(reporter, surfaceContext.get(), false, "EGLImageTest-write");
192192

193193
// Only test RT-config
194194
// TODO: why do we always need to draw to copy from an external texture?
195-
test_copy_from_surface(reporter, context0, surfaceContext->asSurfaceProxy(),
196-
GrColorType::kRGBA_8888, pixels.get(), "EGLImageTest-copy");
195+
TestCopyFromSurface(reporter, context0, surfaceContext->asSurfaceProxy(),
196+
GrColorType::kRGBA_8888, pixels.get(), "EGLImageTest-copy");
197197

198198
cleanup(glCtx0, externalTexture.fID, glCtx1.get(), context1, &backendTexture1, image);
199199
}

‎tests/ExtendedSkColorTypeTests.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ static void compare_pixmaps(skiatest::Reporter* reporter,
167167
diffs[0], diffs[1], diffs[2], diffs[3]);
168168
});
169169

170-
compare_pixels(expected, actual, tols, error);
170+
ComparePixels(expected, actual, tols, error);
171171
}
172172

173173
static void gpu_tests(GrContext* context, skiatest::Reporter* reporter, const TestCase& test) {

‎tests/GrSurfaceTest.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ReadOnlyTexture, reporter, context_info) {
447447

448448
// Mip regen should not work with a read only texture.
449449
if (context->priv().caps()->mipMapSupport()) {
450-
delete_backend_texture(context, backendTex);
450+
DeleteBackendTexture(context, backendTex);
451451
backendTex = context->createBackendTexture(
452452
kSize, kSize, kRGBA_8888_SkColorType,
453453
SkColors::kTransparent, GrMipMapped::kYes, GrRenderable::kYes,
@@ -462,7 +462,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ReadOnlyTexture, reporter, context_info) {
462462
context->priv().getGpu()->regenerateMipMapLevels(proxy->peekTexture());
463463
REPORTER_ASSERT(reporter, regenResult == (ioType == kRW_GrIOType));
464464
}
465-
delete_backend_texture(context, backendTex);
465+
DeleteBackendTexture(context, backendTex);
466466
}
467467
}
468468

@@ -764,8 +764,8 @@ DEF_GPUTEST_FOR_ALL_CONTEXTS(TextureIdleProcFlushTest, reporter, contextInfo) {
764764

765765
GrBackendTexture backendTexture;
766766

767-
if (!create_backend_texture(context, &backendTexture, info, SkColors::kBlack,
768-
GrMipMapped::kNo, GrRenderable::kNo)) {
767+
if (!CreateBackendTexture(context, &backendTexture, info, SkColors::kBlack,
768+
GrMipMapped::kNo, GrRenderable::kNo)) {
769769
REPORTER_ASSERT(reporter, false);
770770
continue;
771771
}
@@ -776,7 +776,7 @@ DEF_GPUTEST_FOR_ALL_CONTEXTS(TextureIdleProcFlushTest, reporter, contextInfo) {
776776
surf->getCanvas()->drawImage(std::move(img2), 1, 1);
777777
idleTexture.reset();
778778

779-
delete_backend_texture(context, backendTexture);
779+
DeleteBackendTexture(context, backendTexture);
780780
}
781781
}
782782
}

‎tests/GrTestingBackendTextureUploadTest.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ void testing_only_texture_test(skiatest::Reporter* reporter, GrContext* context,
3737
if (doDataUpload) {
3838
SkASSERT(GrMipMapped::kNo == mipMapped);
3939

40-
fill_pixel_data(kWidth, kHeight, expectedPixels.writable_addr32(0, 0));
40+
FillPixelData(kWidth, kHeight, expectedPixels.writable_addr32(0, 0));
4141

4242
backendTex = context->createBackendTexture(&expectedPixels, 1,
4343
renderable, GrProtected::kNo);
@@ -81,9 +81,9 @@ void testing_only_texture_test(skiatest::Reporter* reporter, GrContext* context,
8181
{0, 0}, context);
8282

8383
REPORTER_ASSERT(reporter, result);
84-
REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(expectedPixels.addr32(),
85-
actualPixels.addr32(),
86-
kWidth, kHeight));
84+
REPORTER_ASSERT(reporter,
85+
DoesFullBufferContainCorrectColor(expectedPixels.addr32(),
86+
actualPixels.addr32(), kWidth, kHeight));
8787
}
8888

8989
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrTestingBackendTextureUploadTest, reporter, ctxInfo) {

‎tests/GrUploadPixelsTests.cpp‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ void basic_texture_test(skiatest::Reporter* reporter, GrContext* context, SkColo
2727
SkAutoTMalloc<GrColor> srcBuffer(kWidth*kHeight);
2828
SkAutoTMalloc<GrColor> dstBuffer(kWidth*kHeight);
2929

30-
fill_pixel_data(kWidth, kHeight, srcBuffer.get());
30+
FillPixelData(kWidth, kHeight, srcBuffer.get());
3131

3232
auto grCT = SkColorTypeToGrColorType(ct);
3333
auto proxy = sk_gpu_test::MakeTextureProxyFromData(
@@ -42,10 +42,8 @@ void basic_texture_test(skiatest::Reporter* reporter, GrContext* context, SkColo
4242

4343
bool result = sContext->readPixels(dstInfo, dstBuffer, 0, {0, 0});
4444
REPORTER_ASSERT(reporter, result);
45-
REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(srcBuffer,
46-
dstBuffer,
47-
kWidth,
48-
kHeight));
45+
REPORTER_ASSERT(reporter,
46+
DoesFullBufferContainCorrectColor(srcBuffer, dstBuffer, kWidth, kHeight));
4947

5048
dstInfo = SkImageInfo::Make(10, 2, ct, kPremul_SkAlphaType);
5149
result = sContext->writePixels(dstInfo, srcBuffer, 0, {2, 10});
@@ -56,10 +54,7 @@ void basic_texture_test(skiatest::Reporter* reporter, GrContext* context, SkColo
5654
result = sContext->readPixels(dstInfo, dstBuffer, 0, {2, 10});
5755
REPORTER_ASSERT(reporter, result);
5856

59-
REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(srcBuffer,
60-
dstBuffer,
61-
10,
62-
2));
57+
REPORTER_ASSERT(reporter, DoesFullBufferContainCorrectColor(srcBuffer, dstBuffer, 10, 2));
6358
}
6459

6560
proxy = sk_gpu_test::MakeTextureProxyFromData(
@@ -74,10 +69,8 @@ void basic_texture_test(skiatest::Reporter* reporter, GrContext* context, SkColo
7469

7570
bool result = sContext->readPixels(dstInfo, dstBuffer, 0, {0, 0});
7671
REPORTER_ASSERT(reporter, result);
77-
REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(srcBuffer,
78-
dstBuffer,
79-
kWidth,
80-
kHeight));
72+
REPORTER_ASSERT(reporter,
73+
DoesFullBufferContainCorrectColor(srcBuffer, dstBuffer, kWidth, kHeight));
8174

8275
dstInfo = SkImageInfo::Make(4, 5, ct, kPremul_SkAlphaType);
8376
result = sContext->writePixels(dstInfo, srcBuffer, 0, {5, 4});
@@ -88,10 +81,7 @@ void basic_texture_test(skiatest::Reporter* reporter, GrContext* context, SkColo
8881
result = sContext->readPixels(dstInfo, dstBuffer, 0, {5, 4});
8982
REPORTER_ASSERT(reporter, result);
9083

91-
REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(srcBuffer,
92-
dstBuffer,
93-
4,
94-
5));
84+
REPORTER_ASSERT(reporter, DoesFullBufferContainCorrectColor(srcBuffer, dstBuffer, 4, 5));
9585

9686
}
9787
}

‎tests/ImageTest.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -821,8 +821,8 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(SkImage_NewFromTextureRelease, reporter, c
821821
kPremul_SkAlphaType);
822822
GrBackendTexture backendTex;
823823

824-
if (!create_backend_texture(ctx, &backendTex, ii, SkColors::kRed,
825-
GrMipMapped::kNo, GrRenderable::kNo)) {
824+
if (!CreateBackendTexture(ctx, &backendTex, ii, SkColors::kRed, GrMipMapped::kNo,
825+
GrRenderable::kNo)) {
826826
ERRORF(reporter, "couldn't create backend texture\n");
827827
}
828828

@@ -849,7 +849,7 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(SkImage_NewFromTextureRelease, reporter, c
849849
refImg.reset(nullptr); // force a release of the image
850850
REPORTER_ASSERT(reporter, 1 == releaseChecker.fReleaseCount);
851851

852-
delete_backend_texture(ctx, backendTex);
852+
DeleteBackendTexture(ctx, backendTex);
853853
}
854854

855855
static void test_cross_context_image(skiatest::Reporter* reporter, const GrContextOptions& options,

‎tests/OnFlushCallbackTest.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ class AtlasObject final : public GrOnFlushCallbackObject {
358358
// 1 ref from the 'fAtlasProxy' sk_sp
359359
// 9 refs from the 9 AtlasedRectOps
360360
// The backing GrSurface should have only 1 though bc there is only one proxy
361-
check_single_threaded_proxy_refs(fReporter, fAtlasProxy.get(), 10, 1);
361+
CheckSingleThreadedProxyRefs(fReporter, fAtlasProxy.get(), 10, 1);
362362
auto rtc = resourceProvider->makeRenderTargetContext(fAtlasProxy, GrColorType::kRGBA_8888,
363363
nullptr, nullptr);
364364

0 commit comments

Comments
 (0)