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>
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index d94f0f7..b72c830 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -1303,14 +1303,14 @@
if (0 != memcmp(reference.getPixels(), bitmap.getPixels(), reference.computeByteSize())) {
SkString encoded;
SkString errString("Pixels don't match reference");
- if (bitmap_to_base64_data_uri(reference, &encoded)) {
+ if (BipmapToBase64DataURI(reference, &encoded)) {
errString.append("\nExpected: ");
errString.append(encoded);
} else {
errString.append("\nExpected image failed to encode: ");
errString.append(encoded);
}
- if (bitmap_to_base64_data_uri(bitmap, &encoded)) {
+ if (BipmapToBase64DataURI(bitmap, &encoded)) {
errString.append("\nActual: ");
errString.append(encoded);
} else {
diff --git a/tests/BackendAllocationTest.cpp b/tests/BackendAllocationTest.cpp
index ada040d..b738234 100644
--- a/tests/BackendAllocationTest.cpp
+++ b/tests/BackendAllocationTest.cpp
@@ -171,7 +171,7 @@
diffs[0], diffs[1], diffs[2], diffs[3]);
});
- check_solid_pixels(expected, actual, tols, error);
+ CheckSolidPixels(expected, actual, tols, error);
}
// What would raster do?
diff --git a/tests/DeferredDisplayListTest.cpp b/tests/DeferredDisplayListTest.cpp
index 4886bb1..e816ba6 100644
--- a/tests/DeferredDisplayListTest.cpp
+++ b/tests/DeferredDisplayListTest.cpp
@@ -880,8 +880,8 @@
GrBackendTexture backendTexture;
- if (!create_backend_texture(context, &backendTexture, ii, SkColors::kCyan,
- GrMipMapped::kNo, GrRenderable::kNo)) {
+ if (!CreateBackendTexture(context, &backendTexture, ii, SkColors::kCyan, GrMipMapped::kNo,
+ GrRenderable::kNo)) {
REPORTER_ASSERT(reporter, false);
return;
}
@@ -940,7 +940,7 @@
REPORTER_ASSERT(reporter, fulfillInfo.fTex->unique());
fulfillInfo.fTex.reset();
- delete_backend_texture(context, backendTexture);
+ DeleteBackendTexture(context, backendTexture);
}
////////////////////////////////////////////////////////////////////////////////
diff --git a/tests/EGLImageTest.cpp b/tests/EGLImageTest.cpp
index c7bc112..7f4c6f8 100644
--- a/tests/EGLImageTest.cpp
+++ b/tests/EGLImageTest.cpp
@@ -185,15 +185,15 @@
}
}
- test_read_pixels(reporter, surfaceContext.get(), pixels.get(), "EGLImageTest-read");
+ TestReadPixels(reporter, surfaceContext.get(), pixels.get(), "EGLImageTest-read");
// We should not be able to write to a EXTERNAL texture
- test_write_pixels(reporter, surfaceContext.get(), false, "EGLImageTest-write");
+ TestWritePixels(reporter, surfaceContext.get(), false, "EGLImageTest-write");
// Only test RT-config
// TODO: why do we always need to draw to copy from an external texture?
- test_copy_from_surface(reporter, context0, surfaceContext->asSurfaceProxy(),
- GrColorType::kRGBA_8888, pixels.get(), "EGLImageTest-copy");
+ TestCopyFromSurface(reporter, context0, surfaceContext->asSurfaceProxy(),
+ GrColorType::kRGBA_8888, pixels.get(), "EGLImageTest-copy");
cleanup(glCtx0, externalTexture.fID, glCtx1.get(), context1, &backendTexture1, image);
}
diff --git a/tests/ExtendedSkColorTypeTests.cpp b/tests/ExtendedSkColorTypeTests.cpp
index ce06ec2..be5e90a 100644
--- a/tests/ExtendedSkColorTypeTests.cpp
+++ b/tests/ExtendedSkColorTypeTests.cpp
@@ -167,7 +167,7 @@
diffs[0], diffs[1], diffs[2], diffs[3]);
});
- compare_pixels(expected, actual, tols, error);
+ ComparePixels(expected, actual, tols, error);
}
static void gpu_tests(GrContext* context, skiatest::Reporter* reporter, const TestCase& test) {
diff --git a/tests/GrSurfaceTest.cpp b/tests/GrSurfaceTest.cpp
index be6114e..0b50d85 100644
--- a/tests/GrSurfaceTest.cpp
+++ b/tests/GrSurfaceTest.cpp
@@ -447,7 +447,7 @@
// Mip regen should not work with a read only texture.
if (context->priv().caps()->mipMapSupport()) {
- delete_backend_texture(context, backendTex);
+ DeleteBackendTexture(context, backendTex);
backendTex = context->createBackendTexture(
kSize, kSize, kRGBA_8888_SkColorType,
SkColors::kTransparent, GrMipMapped::kYes, GrRenderable::kYes,
@@ -462,7 +462,7 @@
context->priv().getGpu()->regenerateMipMapLevels(proxy->peekTexture());
REPORTER_ASSERT(reporter, regenResult == (ioType == kRW_GrIOType));
}
- delete_backend_texture(context, backendTex);
+ DeleteBackendTexture(context, backendTex);
}
}
@@ -764,8 +764,8 @@
GrBackendTexture backendTexture;
- if (!create_backend_texture(context, &backendTexture, info, SkColors::kBlack,
- GrMipMapped::kNo, GrRenderable::kNo)) {
+ if (!CreateBackendTexture(context, &backendTexture, info, SkColors::kBlack,
+ GrMipMapped::kNo, GrRenderable::kNo)) {
REPORTER_ASSERT(reporter, false);
continue;
}
@@ -776,7 +776,7 @@
surf->getCanvas()->drawImage(std::move(img2), 1, 1);
idleTexture.reset();
- delete_backend_texture(context, backendTexture);
+ DeleteBackendTexture(context, backendTexture);
}
}
}
diff --git a/tests/GrTestingBackendTextureUploadTest.cpp b/tests/GrTestingBackendTextureUploadTest.cpp
index 8cd1008..3d26aaa 100644
--- a/tests/GrTestingBackendTextureUploadTest.cpp
+++ b/tests/GrTestingBackendTextureUploadTest.cpp
@@ -37,7 +37,7 @@
if (doDataUpload) {
SkASSERT(GrMipMapped::kNo == mipMapped);
- fill_pixel_data(kWidth, kHeight, expectedPixels.writable_addr32(0, 0));
+ FillPixelData(kWidth, kHeight, expectedPixels.writable_addr32(0, 0));
backendTex = context->createBackendTexture(&expectedPixels, 1,
renderable, GrProtected::kNo);
@@ -81,9 +81,9 @@
{0, 0}, context);
REPORTER_ASSERT(reporter, result);
- REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(expectedPixels.addr32(),
- actualPixels.addr32(),
- kWidth, kHeight));
+ REPORTER_ASSERT(reporter,
+ DoesFullBufferContainCorrectColor(expectedPixels.addr32(),
+ actualPixels.addr32(), kWidth, kHeight));
}
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrTestingBackendTextureUploadTest, reporter, ctxInfo) {
diff --git a/tests/GrUploadPixelsTests.cpp b/tests/GrUploadPixelsTests.cpp
index 576451b..9662ea5 100644
--- a/tests/GrUploadPixelsTests.cpp
+++ b/tests/GrUploadPixelsTests.cpp
@@ -27,7 +27,7 @@
SkAutoTMalloc<GrColor> srcBuffer(kWidth*kHeight);
SkAutoTMalloc<GrColor> dstBuffer(kWidth*kHeight);
- fill_pixel_data(kWidth, kHeight, srcBuffer.get());
+ FillPixelData(kWidth, kHeight, srcBuffer.get());
auto grCT = SkColorTypeToGrColorType(ct);
auto proxy = sk_gpu_test::MakeTextureProxyFromData(
@@ -42,10 +42,8 @@
bool result = sContext->readPixels(dstInfo, dstBuffer, 0, {0, 0});
REPORTER_ASSERT(reporter, result);
- REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(srcBuffer,
- dstBuffer,
- kWidth,
- kHeight));
+ REPORTER_ASSERT(reporter,
+ DoesFullBufferContainCorrectColor(srcBuffer, dstBuffer, kWidth, kHeight));
dstInfo = SkImageInfo::Make(10, 2, ct, kPremul_SkAlphaType);
result = sContext->writePixels(dstInfo, srcBuffer, 0, {2, 10});
@@ -56,10 +54,7 @@
result = sContext->readPixels(dstInfo, dstBuffer, 0, {2, 10});
REPORTER_ASSERT(reporter, result);
- REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(srcBuffer,
- dstBuffer,
- 10,
- 2));
+ REPORTER_ASSERT(reporter, DoesFullBufferContainCorrectColor(srcBuffer, dstBuffer, 10, 2));
}
proxy = sk_gpu_test::MakeTextureProxyFromData(
@@ -74,10 +69,8 @@
bool result = sContext->readPixels(dstInfo, dstBuffer, 0, {0, 0});
REPORTER_ASSERT(reporter, result);
- REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(srcBuffer,
- dstBuffer,
- kWidth,
- kHeight));
+ REPORTER_ASSERT(reporter,
+ DoesFullBufferContainCorrectColor(srcBuffer, dstBuffer, kWidth, kHeight));
dstInfo = SkImageInfo::Make(4, 5, ct, kPremul_SkAlphaType);
result = sContext->writePixels(dstInfo, srcBuffer, 0, {5, 4});
@@ -88,10 +81,7 @@
result = sContext->readPixels(dstInfo, dstBuffer, 0, {5, 4});
REPORTER_ASSERT(reporter, result);
- REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(srcBuffer,
- dstBuffer,
- 4,
- 5));
+ REPORTER_ASSERT(reporter, DoesFullBufferContainCorrectColor(srcBuffer, dstBuffer, 4, 5));
}
}
diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp
index 4d923ee..5675236 100644
--- a/tests/ImageTest.cpp
+++ b/tests/ImageTest.cpp
@@ -821,8 +821,8 @@
kPremul_SkAlphaType);
GrBackendTexture backendTex;
- if (!create_backend_texture(ctx, &backendTex, ii, SkColors::kRed,
- GrMipMapped::kNo, GrRenderable::kNo)) {
+ if (!CreateBackendTexture(ctx, &backendTex, ii, SkColors::kRed, GrMipMapped::kNo,
+ GrRenderable::kNo)) {
ERRORF(reporter, "couldn't create backend texture\n");
}
@@ -849,7 +849,7 @@
refImg.reset(nullptr); // force a release of the image
REPORTER_ASSERT(reporter, 1 == releaseChecker.fReleaseCount);
- delete_backend_texture(ctx, backendTex);
+ DeleteBackendTexture(ctx, backendTex);
}
static void test_cross_context_image(skiatest::Reporter* reporter, const GrContextOptions& options,
diff --git a/tests/OnFlushCallbackTest.cpp b/tests/OnFlushCallbackTest.cpp
index 9509924..6222f16 100644
--- a/tests/OnFlushCallbackTest.cpp
+++ b/tests/OnFlushCallbackTest.cpp
@@ -358,7 +358,7 @@
// 1 ref from the 'fAtlasProxy' sk_sp
// 9 refs from the 9 AtlasedRectOps
// The backing GrSurface should have only 1 though bc there is only one proxy
- check_single_threaded_proxy_refs(fReporter, fAtlasProxy.get(), 10, 1);
+ CheckSingleThreadedProxyRefs(fReporter, fAtlasProxy.get(), 10, 1);
auto rtc = resourceProvider->makeRenderTargetContext(fAtlasProxy, GrColorType::kRGBA_8888,
nullptr, nullptr);
diff --git a/tests/ProcessorTest.cpp b/tests/ProcessorTest.cpp
index 948d452..7171868 100644
--- a/tests/ProcessorTest.cpp
+++ b/tests/ProcessorTest.cpp
@@ -189,12 +189,12 @@
// If the fp is cloned the number of refs should increase by one (for the clone)
int expectedProxyRefs = makeClone ? 3 : 2;
- check_single_threaded_proxy_refs(reporter, proxy.get(), expectedProxyRefs, -1);
+ CheckSingleThreadedProxyRefs(reporter, proxy.get(), expectedProxyRefs, -1);
context->flush();
// just one from the 'proxy' sk_sp
- check_single_threaded_proxy_refs(reporter, proxy.get(), 1, 1);
+ CheckSingleThreadedProxyRefs(reporter, proxy.get(), 1, 1);
}
}
}
@@ -331,7 +331,7 @@
auto info = SkImageInfo::Make(widthHeight, widthHeight, kRGBA_8888_SkColorType, kLogAlphaType);
SkBitmap bmp;
bmp.installPixels(info, pixels, widthHeight * sizeof(GrColor));
- return bitmap_to_base64_data_uri(bmp, dst);
+ return BipmapToBase64DataURI(bmp, dst);
}
bool log_texture_proxy(GrContext* context, sk_sp<GrTextureProxy> src, SkString* dst) {
@@ -341,7 +341,7 @@
SkBitmap bm;
SkAssertResult(bm.tryAllocPixels(ii));
SkAssertResult(sContext->readPixels(ii, bm.getPixels(), bm.rowBytes(), {0, 0}));
- return bitmap_to_base64_data_uri(bm, dst);
+ return BipmapToBase64DataURI(bm, dst);
}
bool fuzzy_color_equals(const SkPMColor4f& c1, const SkPMColor4f& c2) {
diff --git a/tests/ProxyRefTest.cpp b/tests/ProxyRefTest.cpp
index 72aad01..cbec417 100644
--- a/tests/ProxyRefTest.cpp
+++ b/tests/ProxyRefTest.cpp
@@ -56,13 +56,13 @@
int backingRefs = proxy->isInstantiated() ? 1 : -1;
- check_single_threaded_proxy_refs(reporter, proxy.get(), 2, backingRefs);
+ CheckSingleThreadedProxyRefs(reporter, proxy.get(), 2, backingRefs);
proxy->instantiate(resourceProvider);
- check_single_threaded_proxy_refs(reporter, proxy.get(), 2, 1);
+ CheckSingleThreadedProxyRefs(reporter, proxy.get(), 2, 1);
}
- check_single_threaded_proxy_refs(reporter, proxy.get(), 1, 1);
+ CheckSingleThreadedProxyRefs(reporter, proxy.get(), 1, 1);
}
// Multiple normal refs
@@ -74,16 +74,16 @@
int backingRefs = proxy->isInstantiated() ? 1 : -1;
- check_single_threaded_proxy_refs(reporter, proxy.get(), 3, backingRefs);
+ CheckSingleThreadedProxyRefs(reporter, proxy.get(), 3, backingRefs);
proxy->instantiate(resourceProvider);
- check_single_threaded_proxy_refs(reporter, proxy.get(), 3, 1);
+ CheckSingleThreadedProxyRefs(reporter, proxy.get(), 3, 1);
proxy->unref();
proxy->unref();
}
- check_single_threaded_proxy_refs(reporter, proxy.get(), 1, 1);
+ CheckSingleThreadedProxyRefs(reporter, proxy.get(), 1, 1);
}
// Continue using (reffing) proxy after instantiation
@@ -94,16 +94,16 @@
int backingRefs = proxy->isInstantiated() ? 1 : -1;
- check_single_threaded_proxy_refs(reporter, proxy.get(), 2, backingRefs);
+ CheckSingleThreadedProxyRefs(reporter, proxy.get(), 2, backingRefs);
proxy->instantiate(resourceProvider);
- check_single_threaded_proxy_refs(reporter, proxy.get(), 2, 1);
+ CheckSingleThreadedProxyRefs(reporter, proxy.get(), 2, 1);
sk_sp<GrTextureProxy> secondExtraRef(proxy);
- check_single_threaded_proxy_refs(reporter, proxy.get(), 3, 1);
+ CheckSingleThreadedProxyRefs(reporter, proxy.get(), 3, 1);
}
- check_single_threaded_proxy_refs(reporter, proxy.get(), 1, 1);
+ CheckSingleThreadedProxyRefs(reporter, proxy.get(), 1, 1);
}
}
}
diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp
index d861a63..cc678a4 100644
--- a/tests/ReadPixelsTest.cpp
+++ b/tests/ReadPixelsTest.cpp
@@ -746,7 +746,7 @@
// This is the part of dstPixels that should have been updated.
SkPixmap actual;
SkAssertResult(dstPixels.extractSubset(&actual, dstWriteRect));
- compare_pixels(ref, actual, tols, error);
+ ComparePixels(ref, actual, tols, error);
const auto* v = dstData.get();
const auto* end = dstData.get() + dstSize;
diff --git a/tests/RectangleTextureTest.cpp b/tests/RectangleTextureTest.cpp
index 4d58437..f1f9102 100644
--- a/tests/RectangleTextureTest.cpp
+++ b/tests/RectangleTextureTest.cpp
@@ -38,8 +38,8 @@
paint.setPorterDuffXPFactory(SkBlendMode::kSrc);
paint.addColorFragmentProcessor(std::move(fp));
rtContext->drawPaint(GrNoClip(), std::move(paint), SkMatrix::I());
- test_read_pixels(reporter, rtContext.get(), expectedPixelValues,
- "RectangleTexture-basic-draw");
+ TestReadPixels(reporter, rtContext.get(), expectedPixelValues,
+ "RectangleTexture-basic-draw");
}
}
@@ -85,7 +85,7 @@
}
}
- test_read_pixels(reporter, rtc, expectedPixels.get(), "RectangleTexture-clear");
+ TestReadPixels(reporter, rtc, expectedPixels.get(), "RectangleTexture-clear");
}
}
@@ -113,7 +113,7 @@
// If this assert ever fails we can add a fallback to do copy as draw, but until then we can
// be more restrictive.
SkAssertResult(dstContext->testCopy(src.get()));
- test_read_pixels(reporter, dstContext, pixels.get(), testName);
+ TestReadPixels(reporter, dstContext, pixels.get(), testName);
}
}
@@ -183,18 +183,18 @@
test_basic_draw_as_src(reporter, context, rectProxy, GrColorType::kRGBA_8888, refPixels);
// Test copy to both a texture and RT
- test_copy_from_surface(reporter, context, rectProxy.get(), GrColorType::kRGBA_8888,
- refPixels, "RectangleTexture-copy-from");
+ TestCopyFromSurface(reporter, context, rectProxy.get(), GrColorType::kRGBA_8888, refPixels,
+ "RectangleTexture-copy-from");
auto rectContext = context->priv().makeWrappedSurfaceContext(
std::move(rectProxy), GrColorType::kRGBA_8888, kPremul_SkAlphaType);
SkASSERT(rectContext);
- test_read_pixels(reporter, rectContext.get(), refPixels, "RectangleTexture-read");
+ TestReadPixels(reporter, rectContext.get(), refPixels, "RectangleTexture-read");
test_copy_to_surface(reporter, context, rectContext.get(), "RectangleTexture-copy-to");
- test_write_pixels(reporter, rectContext.get(), true, "RectangleTexture-write");
+ TestWritePixels(reporter, rectContext.get(), true, "RectangleTexture-write");
test_clear(reporter, rectContext.get());
diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp
index 7c0758d..12fb2fb 100644
--- a/tests/SurfaceTest.cpp
+++ b/tests/SurfaceTest.cpp
@@ -705,8 +705,7 @@
SkImageInfo ii = SkImageInfo::Make(kWidth, kHeight, SkColorType::kRGBA_8888_SkColorType,
kPremul_SkAlphaType);
- if (!create_backend_texture(ctx, outTexture, ii, color, GrMipMapped::kNo,
- GrRenderable::kYes)) {
+ if (!CreateBackendTexture(ctx, outTexture, ii, color, GrMipMapped::kNo, GrRenderable::kYes)) {
return nullptr;
}
@@ -715,7 +714,7 @@
kRGBA_8888_SkColorType,
nullptr, nullptr);
if (!surface) {
- delete_backend_texture(ctx, *outTexture);
+ DeleteBackendTexture(ctx, *outTexture);
return nullptr;
}
return surface;
@@ -730,8 +729,7 @@
SkImageInfo ii = SkImageInfo::Make(kWidth, kHeight, SkColorType::kRGBA_8888_SkColorType,
kPremul_SkAlphaType);
- if (!create_backend_texture(ctx, outTexture, ii, color, GrMipMapped::kNo,
- GrRenderable::kYes)) {
+ if (!CreateBackendTexture(ctx, outTexture, ii, color, GrMipMapped::kNo, GrRenderable::kYes)) {
return nullptr;
}
@@ -740,7 +738,7 @@
nullptr, nullptr);
if (!surface) {
- delete_backend_texture(ctx, *outTexture);
+ DeleteBackendTexture(ctx, *outTexture);
return nullptr;
}
return surface;
@@ -928,8 +926,8 @@
if (useTexture) {
SkImageInfo ii = SkImageInfo::Make(kWidth, kHeight, SkColorType::kRGBA_8888_SkColorType,
kPremul_SkAlphaType);
- if (!create_backend_texture(ctx, &backendTex, ii, SkColors::kRed, GrMipMapped::kNo,
- GrRenderable::kYes)) {
+ if (!CreateBackendTexture(ctx, &backendTex, ii, SkColors::kRed, GrMipMapped::kNo,
+ GrRenderable::kYes)) {
continue;
}
@@ -965,7 +963,7 @@
REPORTER_ASSERT(reporter, 1 == releaseChecker.fReleaseCount);
if (useTexture) {
- delete_backend_texture(ctx, backendTex);
+ DeleteBackendTexture(ctx, backendTex);
} else {
gpu->deleteTestingOnlyBackendRenderTarget(backendRT);
}
@@ -1011,29 +1009,29 @@
for (int sampleCnt : {1, 2}) {
GrBackendTexture backendTexture1;
auto ii = SkImageInfo::Make(10, 10, kRGBA_8888_SkColorType, kPremul_SkAlphaType, nullptr);
- if (!create_backend_texture(context, &backendTexture1, ii, SkColors::kTransparent,
- GrMipMapped::kNo, GrRenderable::kYes)) {
+ if (!CreateBackendTexture(context, &backendTexture1, ii, SkColors::kTransparent,
+ GrMipMapped::kNo, GrRenderable::kYes)) {
continue;
}
SkScopeExit delete1(
- [context, &backendTexture1] { delete_backend_texture(context, backendTexture1); });
+ [context, &backendTexture1] { DeleteBackendTexture(context, backendTexture1); });
GrBackendTexture backendTexture2;
- if (!create_backend_texture(context, &backendTexture2, ii, SkColors::kTransparent,
- GrMipMapped::kNo, GrRenderable::kYes)) {
+ if (!CreateBackendTexture(context, &backendTexture2, ii, SkColors::kTransparent,
+ GrMipMapped::kNo, GrRenderable::kYes)) {
ERRORF(reporter, "Expected to be able to make second texture");
continue;
}
SkScopeExit delete2(
- [context, &backendTexture2] { delete_backend_texture(context, backendTexture2); });
+ [context, &backendTexture2] { DeleteBackendTexture(context, backendTexture2); });
auto ii2 = ii.makeWH(8, 8);
GrBackendTexture backendTexture3;
- if (!create_backend_texture(context, &backendTexture3, ii2, SkColors::kTransparent,
- GrMipMapped::kNo, GrRenderable::kYes)) {
+ if (!CreateBackendTexture(context, &backendTexture3, ii2, SkColors::kTransparent,
+ GrMipMapped::kNo, GrRenderable::kYes)) {
ERRORF(reporter, "Couldn't create different sized texture.");
continue;
}
SkScopeExit delete3(
- [context, &backendTexture3] { delete_backend_texture(context, backendTexture3); });
+ [context, &backendTexture3] { DeleteBackendTexture(context, backendTexture3); });
auto surf = SkSurface::MakeFromBackendTexture(
context, backendTexture1, kTopLeft_GrSurfaceOrigin, sampleCnt,
diff --git a/tests/TestUtils.cpp b/tests/TestUtils.cpp
index 269f3c1..f9996dc 100644
--- a/tests/TestUtils.cpp
+++ b/tests/TestUtils.cpp
@@ -20,9 +20,10 @@
#include "src/gpu/GrTextureProxy.h"
#include "src/gpu/SkGr.h"
-void test_read_pixels(skiatest::Reporter* reporter,
- GrSurfaceContext* srcContext, uint32_t expectedPixelValues[],
- const char* testName) {
+void TestReadPixels(skiatest::Reporter* reporter,
+ GrSurfaceContext* srcContext,
+ uint32_t expectedPixelValues[],
+ const char* testName) {
int pixelCnt = srcContext->width() * srcContext->height();
SkAutoTMalloc<uint32_t> pixels(pixelCnt);
memset(pixels.get(), 0, sizeof(uint32_t)*pixelCnt);
@@ -43,9 +44,10 @@
}
}
-void test_write_pixels(skiatest::Reporter* reporter,
- GrSurfaceContext* dstContext, bool expectedToWork,
- const char* testName) {
+void TestWritePixels(skiatest::Reporter* reporter,
+ GrSurfaceContext* dstContext,
+ bool expectedToWork,
+ const char* testName) {
int pixelCnt = dstContext->width() * dstContext->height();
SkAutoTMalloc<uint32_t> pixels(pixelCnt);
for (int y = 0; y < dstContext->width(); ++y) {
@@ -70,12 +72,15 @@
return;
}
- test_read_pixels(reporter, dstContext, pixels.get(), testName);
+ TestReadPixels(reporter, dstContext, pixels.get(), testName);
}
-void test_copy_from_surface(skiatest::Reporter* reporter, GrContext* context, GrSurfaceProxy* proxy,
- GrColorType colorType, uint32_t expectedPixelValues[],
- const char* testName) {
+void TestCopyFromSurface(skiatest::Reporter* reporter,
+ GrContext* context,
+ GrSurfaceProxy* proxy,
+ GrColorType colorType,
+ uint32_t expectedPixelValues[],
+ const char* testName) {
sk_sp<GrTextureProxy> dstProxy = GrSurfaceProxy::Copy(context, proxy, colorType,
GrMipMapped::kNo, SkBackingFit::kExact,
SkBudgeted::kYes);
@@ -85,10 +90,10 @@
kPremul_SkAlphaType);
SkASSERT(dstContext);
- test_read_pixels(reporter, dstContext.get(), expectedPixelValues, testName);
+ TestReadPixels(reporter, dstContext.get(), expectedPixelValues, testName);
}
-void fill_pixel_data(int width, int height, GrColor* data) {
+void FillPixelData(int width, int height, GrColor* data) {
for (int j = 0; j < height; ++j) {
for (int i = 0; i < width; ++i) {
unsigned int red = (unsigned int)(256.f * (i / (float)width));
@@ -99,25 +104,27 @@
}
}
-bool create_backend_texture(GrContext* context, GrBackendTexture* backendTex,
- const SkImageInfo& ii, const SkColor4f& color,
- GrMipMapped mipMapped, GrRenderable renderable) {
+bool CreateBackendTexture(GrContext* context,
+ GrBackendTexture* backendTex,
+ const SkImageInfo& ii,
+ const SkColor4f& color,
+ GrMipMapped mipMapped,
+ GrRenderable renderable) {
*backendTex = context->createBackendTexture(ii.width(), ii.height(), ii.colorType(),
color, mipMapped, renderable);
return backendTex->isValid();
}
-void delete_backend_texture(GrContext* context, const GrBackendTexture& backendTex) {
+void DeleteBackendTexture(GrContext* context, const GrBackendTexture& backendTex) {
GrFlushInfo flushInfo;
flushInfo.fFlags = kSyncCpu_GrFlushFlag;
context->flush(flushInfo);
context->deleteBackendTexture(backendTex);
}
-bool does_full_buffer_contain_correct_color(const GrColor* srcBuffer,
- const GrColor* dstBuffer,
- int width,
- int height) {
+bool DoesFullBufferContainCorrectColor(const GrColor* srcBuffer,
+ const GrColor* dstBuffer,
+ int width, int height) {
const GrColor* srcPtr = srcBuffer;
const GrColor* dstPtr = dstBuffer;
for (int j = 0; j < height; ++j) {
@@ -132,7 +139,7 @@
return true;
}
-bool bitmap_to_base64_data_uri(const SkBitmap& bitmap, SkString* dst) {
+bool BipmapToBase64DataURI(const SkBitmap& bitmap, SkString* dst) {
SkPixmap pm;
if (!bitmap.peekPixels(&pm)) {
dst->set("peekPixels failed");
@@ -195,9 +202,9 @@
return true;
}
-bool compare_pixels(const GrImageInfo& infoA, const char* a, size_t rowBytesA,
- const GrImageInfo& infoB, const char* b, size_t rowBytesB,
- const float tolRGBA[4], std::function<ComparePixmapsErrorReporter>& error) {
+bool ComparePixels(const GrImageInfo& infoA, const char* a, size_t rowBytesA,
+ const GrImageInfo& infoB, const char* b, size_t rowBytesB,
+ const float tolRGBA[4], std::function<ComparePixmapsErrorReporter>& error) {
if (infoA.width() != infoB.width() || infoA.height() != infoB.height()) {
static constexpr float kDummyDiffs[4] = {};
error(-1, -1, kDummyDiffs);
@@ -238,15 +245,15 @@
tolRGBA, error);
}
-bool compare_pixels(const SkPixmap& a, const SkPixmap& b, const float tolRGBA[4],
- std::function<ComparePixmapsErrorReporter>& error) {
- return compare_pixels(a.info(), static_cast<const char*>(a.addr()), a.rowBytes(),
- b.info(), static_cast<const char*>(b.addr()), b.rowBytes(),
- tolRGBA, error);
+bool ComparePixels(const SkPixmap& a, const SkPixmap& b, const float tolRGBA[4],
+ std::function<ComparePixmapsErrorReporter>& error) {
+ return ComparePixels(a.info(), static_cast<const char*>(a.addr()), a.rowBytes(),
+ b.info(), static_cast<const char*>(b.addr()), b.rowBytes(),
+ tolRGBA, error);
}
-bool check_solid_pixels(const SkColor4f& col, const SkPixmap& pixmap,
- const float tolRGBA[4], std::function<ComparePixmapsErrorReporter>& error) {
+bool CheckSolidPixels(const SkColor4f& col, const SkPixmap& pixmap,
+ const float tolRGBA[4], std::function<ComparePixmapsErrorReporter>& error) {
size_t floatBpp = GrColorTypeBytesPerPixel(GrColorType::kRGBA_F32);
@@ -286,10 +293,10 @@
tolRGBA, error);
}
-void check_single_threaded_proxy_refs(skiatest::Reporter* reporter,
- GrTextureProxy* proxy,
- int32_t expectedProxyRefs,
- int32_t expectedBackingRefs) {
+void CheckSingleThreadedProxyRefs(skiatest::Reporter* reporter,
+ GrTextureProxy* proxy,
+ int32_t expectedProxyRefs,
+ int32_t expectedBackingRefs) {
int32_t actualBackingRefs = proxy->testingOnly_getBackingRefCnt();
REPORTER_ASSERT(reporter, proxy->refCntGreaterThan(expectedProxyRefs - 1) &&
diff --git a/tests/TestUtils.h b/tests/TestUtils.h
index c412607..53f904a 100644
--- a/tests/TestUtils.h
+++ b/tests/TestUtils.h
@@ -14,37 +14,41 @@
typedef uint32_t GrColor;
// Ensure that reading back from 'srcContext' as RGBA 8888 matches 'expectedPixelValues
-void test_read_pixels(skiatest::Reporter*, GrSurfaceContext* srcContext,
- uint32_t expectedPixelValues[], const char* testName);
+void TestReadPixels(skiatest::Reporter*, GrSurfaceContext* srcContext,
+ uint32_t expectedPixelValues[], const char* testName);
// See if trying to write RGBA 8888 pixels to 'dstContext' matches matches the
// expectation ('expectedToWork')
-void test_write_pixels(skiatest::Reporter*, GrSurfaceContext* srcContext, bool expectedToWork,
- const char* testName);
+void TestWritePixels(skiatest::Reporter*, GrSurfaceContext* srcContext, bool expectedToWork,
+ const char* testName);
// Ensure that the pixels can be copied from 'proxy' viewed as colorType, to an RGBA 8888
// destination (both texture-backed and rendertarget-backed).
-void test_copy_from_surface(skiatest::Reporter*, GrContext*, GrSurfaceProxy* proxy,
- GrColorType colorType, uint32_t expectedPixelValues[],
- const char* testName);
+void TestCopyFromSurface(skiatest::Reporter*, GrContext*, GrSurfaceProxy* proxy,
+ GrColorType colorType, uint32_t expectedPixelValues[],
+ const char* testName);
// Fills data with a red-green gradient
-void fill_pixel_data(int width, int height, GrColor* data);
+void FillPixelData(int width, int height, GrColor* data);
// Create a solid colored backend texture
-bool create_backend_texture(GrContext*, GrBackendTexture* backendTex,
- const SkImageInfo& ii, const SkColor4f& color,
- GrMipMapped, GrRenderable);
+bool CreateBackendTexture(GrContext*,
+ GrBackendTexture* backendTex,
+ const SkImageInfo& ii,
+ const SkColor4f& color,
+ GrMipMapped,
+ GrRenderable);
-void delete_backend_texture(GrContext*, const GrBackendTexture& backendTex);
+void DeleteBackendTexture(GrContext*, const GrBackendTexture& backendTex);
// Checks srcBuffer and dstBuffer contain the same colors
-bool does_full_buffer_contain_correct_color(const GrColor* srcBuffer, const GrColor* dstBuffer,
- int width, int height);
+bool DoesFullBufferContainCorrectColor(const GrColor* srcBuffer,
+ const GrColor* dstBuffer,
+ int width, int height);
// Encodes the bitmap into a data:/image/png;base64,... url suitable to view in a browser after
// printing to a log. If false is returned, dst holds an error message instead of a URI.
-bool bitmap_to_base64_data_uri(const SkBitmap& bitmap, SkString* dst);
+bool BipmapToBase64DataURI(const SkBitmap& bitmap, SkString* dst);
/** Used by compare_pixels. */
using ComparePixmapsErrorReporter = void(int x, int y, const float diffs[4]);
@@ -68,25 +72,27 @@
* The function quits after a single error is reported and returns false if 'error' was called and
* true otherwise.
*/
-bool compare_pixels(const GrImageInfo& infoA, const char* a, size_t rowBytesA,
- const GrImageInfo& infoB, const char* b, size_t rowBytesB,
- const float tolRGBA[4], std::function<ComparePixmapsErrorReporter>& error);
+bool ComparePixels(const GrImageInfo& infoA, const char* a, size_t rowBytesA,
+ const GrImageInfo& infoB, const char* b, size_t rowBytesB,
+ const float tolRGBA[4], std::function<ComparePixmapsErrorReporter>& error);
/** Convenience version of above that takes SkPixmap inputs. */
-bool compare_pixels(const SkPixmap& a, const SkPixmap& b, const float tolRGBA[4],
- std::function<ComparePixmapsErrorReporter>& error);
+bool ComparePixels(const SkPixmap& a, const SkPixmap& b, const float tolRGBA[4],
+ std::function<ComparePixmapsErrorReporter>& error);
/**
* Convenience version that checks that 'pixmap' is a solid field of 'col'
*/
-bool check_solid_pixels(const SkColor4f& col, const SkPixmap& pixmap,
- const float tolRGBA[4], std::function<ComparePixmapsErrorReporter>& error);
+bool CheckSolidPixels(const SkColor4f& col,
+ const SkPixmap& pixmap,
+ const float tolRGBA[4],
+ std::function<ComparePixmapsErrorReporter>& error);
/**
* Checks the ref cnt on a proxy and its backing store. This is only valid if the proxy and the
* resource are both used on a single thread.
*/
-void check_single_threaded_proxy_refs(skiatest::Reporter* reporter,
- GrTextureProxy* proxy,
- int32_t expectedProxyRefs,
- int32_t expectedBackingRefs);
+void CheckSingleThreadedProxyRefs(skiatest::Reporter* reporter,
+ GrTextureProxy* proxy,
+ int32_t expectedProxyRefs,
+ int32_t expectedBackingRefs);
diff --git a/tests/TransferPixelsTest.cpp b/tests/TransferPixelsTest.cpp
index cd88277..10e29c7 100644
--- a/tests/TransferPixelsTest.cpp
+++ b/tests/TransferPixelsTest.cpp
@@ -196,8 +196,8 @@
GrImageInfo srcInfo(allowedSrc.fColorType, kUnpremul_SkAlphaType, nullptr, tex->width(),
tex->height());
GrImageInfo dstInfo(colorType, kUnpremul_SkAlphaType, nullptr, tex->width(), tex->height());
- compare_pixels(srcInfo, srcData.get(), srcRowBytes, dstInfo, dstBuffer.get(), dstRowBytes,
- compareTolerances, error);
+ ComparePixels(srcInfo, srcData.get(), srcRowBytes, dstInfo, dstBuffer.get(), dstRowBytes,
+ compareTolerances, error);
//////////////////////////
// transfer partial data
@@ -246,8 +246,8 @@
static_cast<int>(colorType));
return;
}
- compare_pixels(srcInfo, srcData.get(), srcRowBytes, dstInfo, dstBuffer.get(), dstRowBytes,
- compareTolerances, error);
+ ComparePixels(srcInfo, srcData.get(), srcRowBytes, dstInfo, dstBuffer.get(), dstRowBytes,
+ compareTolerances, error);
}
void basic_transfer_from_test(skiatest::Reporter* reporter, const sk_gpu_test::ContextInfo& ctxInfo,
@@ -375,8 +375,8 @@
});
GrImageInfo textureDataInfo(colorType, kUnpremul_SkAlphaType, nullptr, kTextureWidth,
kTextureHeight);
- compare_pixels(textureDataInfo, textureData.get(), textureDataRowBytes, transferInfo,
- transferData.get(), fullBufferRowBytes, tol, error);
+ ComparePixels(textureDataInfo, textureData.get(), textureDataRowBytes, transferInfo,
+ transferData.get(), fullBufferRowBytes, tol, error);
///////////////////////
// Now test a partial read at an offset into the buffer.
@@ -408,8 +408,8 @@
const char* textureDataStart =
textureData.get() + textureDataRowBytes * kPartialTop + textureDataBpp * kPartialLeft;
textureDataInfo = textureDataInfo.makeWH(kPartialWidth, kPartialHeight);
- compare_pixels(textureDataInfo, textureDataStart, textureDataRowBytes, transferInfo,
- transferData.get(), partialBufferRowBytes, tol, error);
+ ComparePixels(textureDataInfo, textureDataStart, textureDataRowBytes, transferInfo,
+ transferData.get(), partialBufferRowBytes, tol, error);
#if GR_GPU_STATS
REPORTER_ASSERT(reporter, gpu->stats()->transfersFromSurface() == expectedTransferCnt);
#else