aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Greg Daniel <egdaniel@google.com>2018-03-15 13:00:28 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-03-15 17:30:26 +0000
commitbdea98cff19c186c1492af9461cd0e0f4ad90541 (patch)
treea4e9c8c7a416cd852a172a0453a65d8436807410
parent25375e80c26951b4c9894f86ae209c126b991581 (diff)
Delete unused VkClearTest
Bug: skia: Change-Id: I4aa1886e7f4048fc13a741ddbc37b9ca3f48a41d Reviewed-on: https://skia-review.googlesource.com/114510 Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Ben Wagner <bungeman@google.com>
-rw-r--r--gn/tests.gni1
-rw-r--r--tests/VkClearTests.cpp208
2 files changed, 0 insertions, 209 deletions
diff --git a/gn/tests.gni b/gn/tests.gni
index cde4e1a937..661179e0aa 100644
--- a/gn/tests.gni
+++ b/gn/tests.gni
@@ -271,7 +271,6 @@ tests_sources = [
"$_tests/UnicodeTest.cpp",
"$_tests/UtilsTest.cpp",
"$_tests/VerticesTest.cpp",
- "$_tests/VkClearTests.cpp",
"$_tests/VkHeapTests.cpp",
"$_tests/VkMakeCopyPipelineTest.cpp",
"$_tests/VkUploadPixelsTests.cpp",
diff --git a/tests/VkClearTests.cpp b/tests/VkClearTests.cpp
deleted file mode 100644
index 0dcb446ee5..0000000000
--- a/tests/VkClearTests.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-// This is a GPU-backend specific test. It relies on static intializers to work
-
-#include "SkTypes.h"
-
-#if SK_SUPPORT_GPU && defined(SK_VULKAN)
-
-#include "GrContextFactory.h"
-#include "GrTest.h"
-#include "Test.h"
-#include "vk/GrVkGpu.h"
-
-using sk_gpu_test::GrContextFactory;
-
-bool does_full_buffer_contain_correct_color(GrColor* buffer,
- GrColor clearColor,
- GrPixelConfig config,
- int width,
- int height) {
- GrColor matchColor;
- if (kRGBA_8888_GrPixelConfig == config) {
- matchColor = clearColor;
- } else if (kBGRA_8888_GrPixelConfig) {
- // Hack to flip the R, B componets in the GrColor so that the comparrison will work below
- matchColor = GrColorPackRGBA(GrColorUnpackB(clearColor),
- GrColorUnpackG(clearColor),
- GrColorUnpackR(clearColor),
- GrColorUnpackA(clearColor));
- } else {
- // currently only supporting rgba_8888 and bgra_8888
- return false;
- }
-
- for (int j = 0; j < height; ++j) {
- for (int i = 0; i < width; ++i) {
- if (buffer[j * width + i] != matchColor) {
- return false;
- }
- }
- }
- return true;
-}
-
-void basic_clear_test(skiatest::Reporter* reporter, GrContext* context, GrPixelConfig config) {
-#if 0
- GrVkGpu* gpu = static_cast<GrVkGpu*>(context->getGpu());
- SkAutoTMalloc<GrColor> buffer(25);
-
- GrSurfaceDesc surfDesc;
- surfDesc.fFlags = kRenderTarget_GrSurfaceFlag;
- surfDesc.fOrigin = kTopLeft_GrSurfaceOrigin;
- surfDesc.fWidth = 5;
- surfDesc.fHeight = 5;
- surfDesc.fConfig = config;
- surfDesc.fSampleCnt = 1;
- GrTexture* tex = gpu->createTexture(surfDesc, SkBudgeted::kNo);
- SkASSERT(tex);
- SkASSERT(tex->asRenderTarget());
- SkIRect rect = SkIRect::MakeWH(5, 5);
-
- gpu->clear(rect, GrColor_TRANSPARENT_BLACK, tex->asRenderTarget());
-
- gpu->readPixels(tex, 0, 0, 5, 5, config, (void*)buffer.get(), 0);
-
- REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(buffer.get(),
- GrColor_TRANSPARENT_BLACK,
- config,
- 5,
- 5));
-
- gpu->clear(rect, GrColor_WHITE, tex->asRenderTarget());
-
- gpu->readPixels(tex, 0, 0, 5, 5, config, (void*)buffer.get(), 0);
-
- REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(buffer.get(),
- GrColor_WHITE,
- config,
- 5,
- 5));
-
- GrColor myColor = GrColorPackRGBA(0xFF, 0x7F, 0x40, 0x20);
-
- gpu->clear(rect, myColor, tex->asRenderTarget());
-
- gpu->readPixels(tex, 0, 0, 5, 5, config, (void*)buffer.get(), 0);
-
- REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(buffer.get(),
- myColor,
- config,
- 5,
- 5));
-#endif
-}
-
-void sub_clear_test(skiatest::Reporter* reporter, GrContext* context, GrPixelConfig config) {
-#if 0
- const int width = 10;
- const int height = 10;
- const int subWidth = width/2;
- const int subHeight = height/2;
- GrVkGpu* gpu = static_cast<GrVkGpu*>(context->getGpu());
- SkAutoTMalloc<GrColor> buffer(width * height);
- SkAutoTMalloc<GrColor> subBuffer(subWidth * subHeight);
-
- GrSurfaceDesc surfDesc;
- surfDesc.fFlags = kRenderTarget_GrSurfaceFlag;
- surfDesc.fOrigin = kTopLeft_GrSurfaceOrigin;
- surfDesc.fWidth = width;
- surfDesc.fHeight = height;
- surfDesc.fConfig = config;
- surfDesc.fSampleCnt = 1;
- GrTexture* tex = gpu->createTexture(surfDesc, SkBudgeted::kNo);
- SkASSERT(tex);
- SkASSERT(tex->asRenderTarget());
-
- SkIRect fullRect = SkIRect::MakeWH(10, 10);
- gpu->clear(fullRect, GrColor_TRANSPARENT_BLACK, tex->asRenderTarget());
-
- gpu->readPixels(tex, 0, 0, width, height, config, (void*)buffer.get(), 0);
-
- REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(buffer.get(),
- GrColor_TRANSPARENT_BLACK,
- config,
- width,
- height));
- SkIRect rect;
- rect = SkIRect::MakeXYWH(0, 0, subWidth, subHeight);
- gpu->clear(rect, GrColor_WHITE, tex->asRenderTarget());
- rect = SkIRect::MakeXYWH(subWidth, 0, subWidth, subHeight);
- gpu->clear(rect, GrColor_WHITE, tex->asRenderTarget());
- rect = SkIRect::MakeXYWH(0, subHeight, subWidth, subHeight);
- gpu->clear(rect, GrColor_WHITE, tex->asRenderTarget());
-
- // Should fail since bottom right sub area has not been cleared to white
- gpu->readPixels(tex, 0, 0, width, height, config, (void*)buffer.get(), 0);
- REPORTER_ASSERT(reporter, !does_full_buffer_contain_correct_color(buffer.get(),
- GrColor_WHITE,
- config,
- width,
- height));
-
- rect = SkIRect::MakeXYWH(subWidth, subHeight, subWidth, subHeight);
- gpu->clear(rect, GrColor_WHITE, tex->asRenderTarget());
-
- gpu->readPixels(tex, 0, 0, width, height, config, (void*)buffer.get(), 0);
- REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(buffer.get(),
- GrColor_WHITE,
- config,
- width,
- height));
-
- // Try different colors and that each sub area has correct color
- GrColor subColor1 = GrColorPackRGBA(0xFF, 0x00, 0x00, 0xFF);
- GrColor subColor2 = GrColorPackRGBA(0x00, 0xFF, 0x00, 0xFF);
- GrColor subColor3 = GrColorPackRGBA(0x00, 0x00, 0xFF, 0xFF);
- GrColor subColor4 = GrColorPackRGBA(0xFF, 0xFF, 0x00, 0xFF);
-
- rect = SkIRect::MakeXYWH(0, 0, subWidth, subHeight);
- gpu->clear(rect, subColor1, tex->asRenderTarget());
- rect = SkIRect::MakeXYWH(subWidth, 0, subWidth, subHeight);
- gpu->clear(rect, subColor2, tex->asRenderTarget());
- rect = SkIRect::MakeXYWH(0, subHeight, subWidth, subHeight);
- gpu->clear(rect, subColor3, tex->asRenderTarget());
- rect = SkIRect::MakeXYWH(subWidth, subHeight, subWidth, subHeight);
- gpu->clear(rect, subColor4, tex->asRenderTarget());
-
- gpu->readPixels(tex, 0, 0, subWidth, subHeight, config, (void*)subBuffer.get(), 0);
- REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(subBuffer.get(),
- subColor1,
- config,
- subWidth,
- subHeight));
- gpu->readPixels(tex, subWidth, 0, subWidth, subHeight, config, (void*)subBuffer.get(), 0);
- REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(subBuffer.get(),
- subColor2,
- config,
- subWidth,
- subHeight));
- gpu->readPixels(tex, 0, subHeight, subWidth, subHeight, config, (void*)subBuffer.get(), 0);
- REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(subBuffer.get(),
- subColor3,
- config,
- subWidth,
- subHeight));
- gpu->readPixels(tex, subWidth, subHeight, subWidth, subHeight,
- config, (void*)subBuffer.get(), 0);
- REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(subBuffer.get(),
- subColor4,
- config,
- subWidth,
- subHeight));
-#endif
-}
-
-DEF_GPUTEST_FOR_VULKAN_CONTEXT(VkClearTests, reporter, ctxInfo) {
- basic_clear_test(reporter, ctxInfo.grContext(), kRGBA_8888_GrPixelConfig);
- basic_clear_test(reporter, ctxInfo.grContext(), kBGRA_8888_GrPixelConfig);
- sub_clear_test(reporter, ctxInfo.grContext(), kRGBA_8888_GrPixelConfig);
- sub_clear_test(reporter, ctxInfo.grContext(), kBGRA_8888_GrPixelConfig);
-}
-
-#endif