c34d993b62
This reverts commit 5509102043.
Reason for revert: valgrind issues
Original change's description:
> Add function to GrDataUtils to handle color conversions.
>
> Like SkConvertPixels but knows about all GrColorTypes, origin, and can
> apply an arbitrary GrSwizzle.
>
> Use in GrSurfaceContext read/write pixels methods.
>
> Add support for '0' to GrSwizzle.
>
>
> Change-Id: Ib9dd215fcb0ee8b33c4020893c22b4ab7ce1f40b
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/220761
> Commit-Queue: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Greg Daniel <egdaniel@google.com>
TBR=egdaniel@google.com,bsalomon@google.com,brianosman@google.com
Change-Id: If50f3e26875787d9309009e9c701774fbad0afda
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/221538
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
105 lines
3.9 KiB
C++
105 lines
3.9 KiB
C++
/*
|
|
* 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 "src/core/SkAutoPixmapStorage.h"
|
|
#include "src/gpu/GrContextPriv.h"
|
|
#include "src/gpu/GrGpu.h"
|
|
#include "src/gpu/GrSurfaceContext.h"
|
|
#include "src/gpu/SkGr.h"
|
|
#include "tests/Test.h"
|
|
#include "tests/TestUtils.h"
|
|
|
|
void testing_only_texture_test(skiatest::Reporter* reporter, GrContext* context, SkColorType ct,
|
|
GrRenderable renderable, bool doDataUpload, GrMipMapped mipMapped) {
|
|
|
|
const int kWidth = 16;
|
|
const int kHeight = 16;
|
|
|
|
SkImageInfo ii = SkImageInfo::Make(kWidth, kHeight, ct, kPremul_SkAlphaType);
|
|
|
|
SkAutoPixmapStorage expectedPixels, actualPixels;
|
|
expectedPixels.alloc(ii);
|
|
actualPixels.alloc(ii);
|
|
|
|
const GrCaps* caps = context->priv().caps();
|
|
|
|
GrPixelConfig config = SkColorType2GrPixelConfig(ct);
|
|
if (!caps->isConfigTexturable(config)) {
|
|
return;
|
|
}
|
|
|
|
GrColorType grCT = SkColorTypeToGrColorType(ct);
|
|
if (GrColorType::kUnknown == grCT) {
|
|
return;
|
|
}
|
|
|
|
if (caps->supportedReadPixelsColorType(config, grCT) != grCT) {
|
|
return;
|
|
}
|
|
|
|
GrBackendTexture backendTex;
|
|
|
|
if (doDataUpload) {
|
|
SkASSERT(GrMipMapped::kNo == mipMapped);
|
|
|
|
fill_pixel_data(kWidth, kHeight, expectedPixels.writable_addr32(0, 0));
|
|
|
|
backendTex = context->priv().createBackendTexture(&expectedPixels, 1, renderable);
|
|
} else {
|
|
backendTex = context->createBackendTexture(kWidth, kHeight, ct, SkColors::kTransparent,
|
|
mipMapped, renderable);
|
|
|
|
size_t allocSize = SkAutoPixmapStorage::AllocSize(ii, nullptr);
|
|
// createBackendTexture will fill the texture with 0's if no data is provided, so
|
|
// we set the expected result likewise.
|
|
memset(expectedPixels.writable_addr32(0, 0), 0, allocSize);
|
|
}
|
|
if (!backendTex.isValid()) {
|
|
return;
|
|
}
|
|
|
|
sk_sp<GrTextureProxy> wrappedProxy;
|
|
if (GrRenderable::kYes == renderable) {
|
|
wrappedProxy = context->priv().proxyProvider()->wrapRenderableBackendTexture(
|
|
backendTex, kTopLeft_GrSurfaceOrigin, 1, kAdopt_GrWrapOwnership,
|
|
GrWrapCacheable::kNo);
|
|
} else {
|
|
wrappedProxy = context->priv().proxyProvider()->wrapBackendTexture(
|
|
backendTex, kTopLeft_GrSurfaceOrigin, kAdopt_GrWrapOwnership, GrWrapCacheable::kNo,
|
|
GrIOType::kRW_GrIOType);
|
|
}
|
|
REPORTER_ASSERT(reporter, wrappedProxy);
|
|
|
|
auto surfaceContext = context->priv().makeWrappedSurfaceContext(std::move(wrappedProxy));
|
|
REPORTER_ASSERT(reporter, surfaceContext);
|
|
|
|
bool result = surfaceContext->readPixels(context, 0, 0, kWidth, kHeight, grCT, nullptr,
|
|
actualPixels.writable_addr(), actualPixels.rowBytes());
|
|
|
|
REPORTER_ASSERT(reporter, result);
|
|
REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(expectedPixels.addr32(),
|
|
actualPixels.addr32(),
|
|
kWidth, kHeight));
|
|
}
|
|
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrTestingBackendTextureUploadTest, reporter, ctxInfo) {
|
|
for (auto colorType: { kRGBA_8888_SkColorType, kBGRA_8888_SkColorType }) {
|
|
for (auto renderable: { GrRenderable::kYes, GrRenderable::kNo }) {
|
|
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);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|