aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorGravatar Timothy Liang <timliang@google.com>2018-07-19 09:58:00 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-07-19 19:26:15 +0000
commita8046af0b0501e53726c01fa5ec2ec6590c79a82 (patch)
tree600e9ff937e325da8b1ee56f0b3da819ae234433 /tests
parent97ae0c89025dfd791047f5701e57d58da37c125c (diff)
implemented onWritePixels and related tests for metal gpu backend
Bug: skia: Change-Id: Iab8bc8611a9de8afcf0eaeb58a8ef46fdc38d4f1 Reviewed-on: https://skia-review.googlesource.com/140571 Commit-Queue: Timothy Liang <timliang@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/GrUploadPixelsTests.cpp (renamed from tests/VkUploadPixelsTests.cpp)7
1 files changed, 1 insertions, 6 deletions
diff --git a/tests/VkUploadPixelsTests.cpp b/tests/GrUploadPixelsTests.cpp
index b13de41571..88a6bc14b6 100644
--- a/tests/VkUploadPixelsTests.cpp
+++ b/tests/GrUploadPixelsTests.cpp
@@ -9,8 +9,6 @@
#include "SkTypes.h"
-#if defined(SK_VULKAN)
-
#include "GrContextFactory.h"
#include "GrContextPriv.h"
#include "GrSurfaceProxy.h"
@@ -19,7 +17,6 @@
#include "SkGr.h"
#include "Test.h"
#include "TestUtils.h"
-#include "vk/GrVkGpu.h"
using sk_gpu_test::GrContextFactory;
@@ -94,7 +91,7 @@ void basic_texture_test(skiatest::Reporter* reporter, GrContext* context, SkColo
}
}
-DEF_GPUTEST_FOR_VULKAN_CONTEXT(VkUploadPixelsTests, reporter, ctxInfo) {
+DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrUploadPixelsTests, reporter, ctxInfo) {
// RGBA
basic_texture_test(reporter, ctxInfo.grContext(), kRGBA_8888_SkColorType, false);
basic_texture_test(reporter, ctxInfo.grContext(), kRGBA_8888_SkColorType, true);
@@ -103,5 +100,3 @@ DEF_GPUTEST_FOR_VULKAN_CONTEXT(VkUploadPixelsTests, reporter, ctxInfo) {
basic_texture_test(reporter, ctxInfo.grContext(), kBGRA_8888_SkColorType, false);
basic_texture_test(reporter, ctxInfo.grContext(), kBGRA_8888_SkColorType, true);
}
-
-#endif