AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add more diagnostic messages to ReadWriteAlpha test

Browse Source 
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1902063002

Review URL: https://codereview.chromium.org/1902063002
This commit is contained in:
robertphillips 2016-04-19 08:32:40 -07:00 committed by Commit bot
parent 2477594a39
commit df082c5425
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tests/ReadWriteAlphaTest.cpp
View File

@ -36,6 +36,8 @@ static void validate_alpha_data(skiatest::Reporter* reporter, int w, int h, cons
DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(ReadWriteAlpha, reporter, ctxInfo) { DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(ReadWriteAlpha, reporter, ctxInfo) {
unsigned char alphaData[X_SIZE * Y_SIZE]; unsigned char alphaData[X_SIZE * Y_SIZE];
static const int kClearValue = 0x2;
bool match; bool match;
static const size_t kRowBytes[] = {0, X_SIZE, X_SIZE + 1, 2 * X_SIZE - 1}; static const size_t kRowBytes[] = {0, X_SIZE, X_SIZE + 1, 2 * X_SIZE - 1};
for (int rt = 0; rt < 2; ++rt) { for (int rt = 0; rt < 2; ++rt) {
@ -68,21 +70,23 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(ReadWriteAlpha, reporter, ctxInfo) {
for (auto rowBytes : kRowBytes) { for (auto rowBytes : kRowBytes) {
// upload the texture (do per-rowbytes iteration because we may overwrite below). // upload the texture (do per-rowbytes iteration because we may overwrite below).
texture->writePixels(0, 0, desc.fWidth, desc.fHeight, desc.fConfig, bool result = texture->writePixels(0, 0, desc.fWidth, desc.fHeight, desc.fConfig,
alphaData, 0); alphaData, 0);
REPORTER_ASSERT_MESSAGE(reporter, result, "Initial A8 writePixels failed");
size_t nonZeroRowBytes = rowBytes ? rowBytes : X_SIZE; size_t nonZeroRowBytes = rowBytes ? rowBytes : X_SIZE;
SkAutoTDeleteArray<uint8_t> readback(new uint8_t[nonZeroRowBytes * Y_SIZE]); SkAutoTDeleteArray<uint8_t> readback(new uint8_t[nonZeroRowBytes * Y_SIZE]);
// clear readback to something non-zero so we can detect readback failures // clear readback to something non-zero so we can detect readback failures
memset(readback.get(), 0x1, nonZeroRowBytes * Y_SIZE); memset(readback.get(), kClearValue, nonZeroRowBytes * Y_SIZE);
// read the texture back // read the texture back
texture->readPixels(0, 0, desc.fWidth, desc.fHeight, desc.fConfig, result = texture->readPixels(0, 0, desc.fWidth, desc.fHeight, desc.fConfig,
readback.get(), rowBytes); readback.get(), rowBytes);
REPORTER_ASSERT_MESSAGE(reporter, result, "Initial A8 readPixels failed");
// make sure the original & read back versions match // make sure the original & read back versions match
SkString msg; SkString msg;
msg.printf("rt:%d, rb:%d", rt, SkToU32(rowBytes)); msg.printf("rt:%d, rb:%d A8", rt, SkToU32(rowBytes));
validate_alpha_data(reporter, X_SIZE, Y_SIZE, readback.get(), nonZeroRowBytes, validate_alpha_data(reporter, X_SIZE, Y_SIZE, readback.get(), nonZeroRowBytes,
alphaData, msg); alphaData, msg);
@ -101,9 +105,10 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(ReadWriteAlpha, reporter, ctxInfo) {
canvas.drawRect(rect, paint); canvas.drawRect(rect, paint);
memset(readback.get(), 0x1, nonZeroRowBytes * Y_SIZE); memset(readback.get(), kClearValue, nonZeroRowBytes * Y_SIZE);
texture->readPixels(0, 0, desc.fWidth, desc.fHeight, desc.fConfig, readback.get(), result = texture->readPixels(0, 0, desc.fWidth, desc.fHeight,
rowBytes); desc.fConfig, readback.get(), rowBytes);
REPORTER_ASSERT_MESSAGE(reporter, result, "A8 readPixels after clear failed");
match = true; match = true;
for (int y = 0; y < Y_SIZE && match; ++y) { for (int y = 0; y < Y_SIZE && match; ++y) {
@ -166,15 +171,17 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(ReadWriteAlpha, reporter, ctxInfo) {
SkAutoTDeleteArray<uint8_t> readback(new uint8_t[nonZeroRowBytes * Y_SIZE]); SkAutoTDeleteArray<uint8_t> readback(new uint8_t[nonZeroRowBytes * Y_SIZE]);
// Clear so we don't accidentally see values from previous iteration. // Clear so we don't accidentally see values from previous iteration.
memset(readback.get(), 0x0, nonZeroRowBytes * Y_SIZE); memset(readback.get(), kClearValue, nonZeroRowBytes * Y_SIZE);
// read the texture back // read the texture back
texture->readPixels(0, 0, desc.fWidth, desc.fHeight, kAlpha_8_GrPixelConfig, bool result = texture->readPixels(0, 0, desc.fWidth, desc.fHeight,
readback.get(), rowBytes); kAlpha_8_GrPixelConfig,
readback.get(), rowBytes);
REPORTER_ASSERT_MESSAGE(reporter, result, "8888 readPixels failed");
// make sure the original & read back versions match // make sure the original & read back versions match
SkString msg; SkString msg;
msg.printf("rt:%d, rb:%d", rt, SkToU32(rowBytes)); msg.printf("rt:%d, rb:%d 8888", rt, SkToU32(rowBytes));
validate_alpha_data(reporter, X_SIZE, Y_SIZE, readback.get(), nonZeroRowBytes, validate_alpha_data(reporter, X_SIZE, Y_SIZE, readback.get(), nonZeroRowBytes,
alphaData, msg); alphaData, msg);
} }