From a80a012456a95a6996a8901268ec34ed0cc3aecb Mon Sep 17 00:00:00 2001 From: Timothy Liang Date: Fri, 13 Jul 2018 19:19:36 +0000 Subject: Revert "implemented metal gpu backend texture upload testing" This reverts commit 36848f6b30ddaca461c98e13b9976b2c449ca547. Reason for revert: Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-All-Android_CCPR failing. Original change's description: > implemented metal gpu backend texture upload testing > > Bug: skia: > Change-Id: Ia3af58a0710f7f9792b37682a3cc45dd14282b71 > Reviewed-on: https://skia-review.googlesource.com/140248 > Commit-Queue: Timothy Liang > Reviewed-by: Greg Daniel TBR=egdaniel@google.com,ethannicholas@google.com,timliang@google.com Change-Id: Idf40fc78b82aec1efbcc64221b6d2bbf63353960 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/141182 Reviewed-by: Timothy Liang Commit-Queue: Timothy Liang --- tests/GrTestingBackendTextureUploadTest.cpp | 81 ----------------------------- 1 file changed, 81 deletions(-) delete mode 100644 tests/GrTestingBackendTextureUploadTest.cpp (limited to 'tests/GrTestingBackendTextureUploadTest.cpp') diff --git a/tests/GrTestingBackendTextureUploadTest.cpp b/tests/GrTestingBackendTextureUploadTest.cpp deleted file mode 100644 index 1bdd455d67..0000000000 --- a/tests/GrTestingBackendTextureUploadTest.cpp +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright 2018 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "SkTypes.h" - -#include "GrGpu.h" -#include "GrContextPriv.h" -#include "GrTexture.h" -#include "SkConvertPixels.h" -#include "Test.h" -#include "TestUtils.h" - -void testing_only_texture_test(skiatest::Reporter* reporter, GrContext* context, GrColorType ct, - bool renderTarget, bool doDataUpload, GrMipMapped mipMapped) { - const int kWidth = 16; - const int kHeight = 16; - SkAutoTMalloc srcBuffer; - if (doDataUpload) { - srcBuffer.reset(kWidth * kHeight); - fill_pixel_data(kWidth, kHeight, srcBuffer.get()); - } - SkAutoTMalloc dstBuffer(kWidth * kHeight); - - GrGpu* gpu = context->contextPriv().getGpu(); - - GrPixelConfig config = GrColorTypeToPixelConfig(ct, GrSRGBEncoded::kNo); - if (!gpu->caps()->isConfigTexturable(config)) { - return; - } - - GrBackendTexture backendTex = gpu->createTestingOnlyBackendTexture(srcBuffer, - kWidth, - kHeight, - config, - renderTarget, - mipMapped); - sk_sp wrappedTex; - if (renderTarget) { - wrappedTex = gpu->wrapRenderableBackendTexture(backendTex, 1, - GrWrapOwnership::kAdopt_GrWrapOwnership); - } else { - wrappedTex = gpu->wrapBackendTexture(backendTex, - GrWrapOwnership::kAdopt_GrWrapOwnership); - } - REPORTER_ASSERT(reporter, wrappedTex); - - int rowBytes = GrColorTypeBytesPerPixel(ct) * kWidth; - bool result = gpu->readPixels(wrappedTex.get(), 0, 0, kWidth, - kHeight, ct, dstBuffer, rowBytes); - - if (!doDataUpload) { - // createTestingOnlyBackendTexture will fill the texture with 0's if no data is provided, so - // we set the expected result likewise. - srcBuffer.reset(kWidth * kHeight); - memset(srcBuffer, 0, kWidth * kHeight * sizeof(GrColor)); - } - REPORTER_ASSERT(reporter, result); - REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(srcBuffer, dstBuffer, - kWidth, kHeight)); -} - -DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrTestingBackendTextureUploadTest, reporter, ctxInfo) { - for (auto colorType: {GrColorType::kRGBA_8888, GrColorType::kBGRA_8888}) { - for (bool renderable: {true, false}) { - for (bool doDataUpload: {true, false}) { - testing_only_texture_test(reporter, ctxInfo.grContext(), colorType, - renderable, doDataUpload, GrMipMapped::kNo); - - if (!doDataUpload) { - testing_only_texture_test(reporter, ctxInfo.grContext(), colorType, - renderable, doDataUpload, GrMipMapped::kYes); - } - } - } - } -} - -- cgit v1.2.3