a1121331a4
I will follow this up with a Chrome-side CL to fix the call sites of the following factories: MakeFromCompressedTexture MakeFromTexture MakeFromYUVATexturesCopyWithExternalBackend MakeFromYUVTexturesCopyWithExternalBackend MakeFromNV12TexturesCopyWithExternalBackend Here is the Chrome-side CL: https://chromium-review.googlesource.com/c/chromium/src/+/2264598/ (Skia's SkImage::Make* factories now guarantee cleanup) Here is the Chrome-side CL that adds the guard flag: https://chromium-review.googlesource.com/c/chromium/src/+/2273067/ (Add flag in order to roll a Skia CL into Chrome) TBR=bsalomon@google.com Bug: 1097484 Change-Id: Ic2fcdc116f0f866b33d752b6d5abc784c7f65be6 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/299663 Reviewed-by: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
107 lines
4.2 KiB
C++
107 lines
4.2 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/GrImageInfo.h"
|
|
#include "src/gpu/GrProxyProvider.h"
|
|
#include "src/gpu/GrSurfaceContext.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();
|
|
|
|
GrColorType grCT = SkColorTypeToGrColorType(ct);
|
|
|
|
GrBackendFormat backendFormat = context->defaultBackendFormat(ct, renderable);
|
|
if (!backendFormat.isValid()) {
|
|
return;
|
|
}
|
|
|
|
GrBackendTexture backendTex;
|
|
|
|
if (doDataUpload) {
|
|
SkASSERT(GrMipMapped::kNo == mipMapped);
|
|
|
|
FillPixelData(kWidth, kHeight, expectedPixels.writable_addr32(0, 0));
|
|
|
|
backendTex = context->createBackendTexture(&expectedPixels, 1,
|
|
renderable, GrProtected::kNo);
|
|
} else {
|
|
backendTex = context->createBackendTexture(kWidth, kHeight, ct, SkColors::kTransparent,
|
|
mipMapped, renderable, GrProtected::kNo);
|
|
|
|
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;
|
|
}
|
|
// skbug.com/9165
|
|
auto supportedRead =
|
|
caps->supportedReadPixelsColorType(grCT, backendTex.getBackendFormat(), grCT);
|
|
if (supportedRead.fColorType != grCT) {
|
|
return;
|
|
}
|
|
|
|
sk_sp<GrTextureProxy> wrappedProxy;
|
|
if (GrRenderable::kYes == renderable) {
|
|
wrappedProxy = context->priv().proxyProvider()->wrapRenderableBackendTexture(
|
|
backendTex, 1, kAdopt_GrWrapOwnership, GrWrapCacheable::kNo, nullptr);
|
|
} else {
|
|
wrappedProxy = context->priv().proxyProvider()->wrapBackendTexture(
|
|
backendTex, kAdopt_GrWrapOwnership, GrWrapCacheable::kNo, GrIOType::kRW_GrIOType);
|
|
}
|
|
REPORTER_ASSERT(reporter, wrappedProxy);
|
|
|
|
GrSwizzle swizzle = context->priv().caps()->getReadSwizzle(wrappedProxy->backendFormat(), grCT);
|
|
GrSurfaceProxyView view(std::move(wrappedProxy), kTopLeft_GrSurfaceOrigin, swizzle);
|
|
auto surfaceContext = GrSurfaceContext::Make(context, std::move(view), grCT,
|
|
kPremul_SkAlphaType, nullptr);
|
|
REPORTER_ASSERT(reporter, surfaceContext);
|
|
|
|
bool result = surfaceContext->readPixels({grCT, kPremul_SkAlphaType, nullptr, kWidth, kHeight},
|
|
actualPixels.writable_addr(), actualPixels.rowBytes(),
|
|
{0, 0}, context);
|
|
|
|
REPORTER_ASSERT(reporter, result);
|
|
REPORTER_ASSERT(reporter,
|
|
DoesFullBufferContainCorrectColor(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);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|