cf0d08e149
This reverts commit d169e1915c.
Reason for revert: broke chrome via code generator
Original change's description:
> Migrate GrSurfaceContext readPixels to take direct context
>
> After this lands we'll proceed up the stack and add the direct
> context requirement to the public API and SkImage.
>
> Bug: skia:104662
> Change-Id: I4b2d779a7fcd65eec68e631757821ac8e136ddba
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/309044
> Commit-Queue: Adlai Holler <adlai@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
TBR=robertphillips@google.com,adlai@google.com
Change-Id: I6126f2dca4bc902c903512ac486e22841cc472e5
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:104662
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/309281
Reviewed-by: Adlai Holler <adlai@google.com>
Commit-Queue: Adlai Holler <adlai@google.com>
106 lines
4.2 KiB
C++
106 lines
4.2 KiB
C++
/*
|
|
* 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 "include/core/SkTypes.h"
|
|
|
|
#include "include/gpu/GrDirectContext.h"
|
|
#include "src/gpu/GrContextPriv.h"
|
|
#include "src/gpu/GrImageInfo.h"
|
|
#include "src/gpu/GrSurfaceContext.h"
|
|
#include "src/gpu/GrSurfaceProxy.h"
|
|
#include "src/gpu/SkGr.h"
|
|
#include "tests/Test.h"
|
|
#include "tests/TestUtils.h"
|
|
#include "tools/gpu/GrContextFactory.h"
|
|
#include "tools/gpu/ProxyUtils.h"
|
|
|
|
using sk_gpu_test::GrContextFactory;
|
|
|
|
void basic_texture_test(skiatest::Reporter* reporter, GrDirectContext* context, SkColorType ct,
|
|
GrRenderable renderable) {
|
|
const int kWidth = 16;
|
|
const int kHeight = 16;
|
|
SkAutoTMalloc<GrColor> srcBuffer(kWidth*kHeight);
|
|
SkAutoTMalloc<GrColor> dstBuffer(kWidth*kHeight);
|
|
|
|
FillPixelData(kWidth, kHeight, srcBuffer.get());
|
|
|
|
auto grCT = SkColorTypeToGrColorType(ct);
|
|
auto proxy = sk_gpu_test::MakeTextureProxyFromData(
|
|
context, renderable, kTopLeft_GrSurfaceOrigin,
|
|
{grCT, kPremul_SkAlphaType, nullptr, kWidth, kHeight}, srcBuffer, 0);
|
|
REPORTER_ASSERT(reporter, proxy);
|
|
if (proxy) {
|
|
GrSwizzle swizzle = context->priv().caps()->getReadSwizzle(proxy->backendFormat(), grCT);
|
|
GrSurfaceProxyView view(proxy, kTopLeft_GrSurfaceOrigin, swizzle);
|
|
auto sContext = GrSurfaceContext::Make(context, std::move(view), grCT, kPremul_SkAlphaType,
|
|
nullptr);
|
|
|
|
SkImageInfo dstInfo = SkImageInfo::Make(kWidth, kHeight, ct, kPremul_SkAlphaType);
|
|
|
|
bool result = sContext->readPixels(dstInfo, dstBuffer, 0, {0, 0});
|
|
REPORTER_ASSERT(reporter, result);
|
|
REPORTER_ASSERT(reporter,
|
|
DoesFullBufferContainCorrectColor(srcBuffer, dstBuffer, kWidth, kHeight));
|
|
|
|
dstInfo = SkImageInfo::Make(10, 2, ct, kPremul_SkAlphaType);
|
|
result = sContext->writePixels(dstInfo, srcBuffer, 0, {2, 10});
|
|
REPORTER_ASSERT(reporter, result);
|
|
|
|
memset(dstBuffer, 0, kWidth*kHeight*sizeof(GrColor));
|
|
|
|
result = sContext->readPixels(dstInfo, dstBuffer, 0, {2, 10});
|
|
REPORTER_ASSERT(reporter, result);
|
|
|
|
REPORTER_ASSERT(reporter, DoesFullBufferContainCorrectColor(srcBuffer, dstBuffer, 10, 2));
|
|
}
|
|
|
|
proxy = sk_gpu_test::MakeTextureProxyFromData(
|
|
context, renderable, kBottomLeft_GrSurfaceOrigin,
|
|
{grCT, kPremul_SkAlphaType, nullptr, kWidth, kHeight}, srcBuffer, 0);
|
|
REPORTER_ASSERT(reporter, proxy);
|
|
if (proxy) {
|
|
GrSwizzle swizzle = context->priv().caps()->getReadSwizzle(proxy->backendFormat(), grCT);
|
|
GrSurfaceProxyView view(proxy, kBottomLeft_GrSurfaceOrigin, swizzle);
|
|
auto sContext = GrSurfaceContext::Make(context, std::move(view), grCT, kPremul_SkAlphaType,
|
|
nullptr);
|
|
|
|
SkImageInfo dstInfo = SkImageInfo::Make(kWidth, kHeight, ct, kPremul_SkAlphaType);
|
|
|
|
bool result = sContext->readPixels(dstInfo, dstBuffer, 0, {0, 0});
|
|
REPORTER_ASSERT(reporter, result);
|
|
REPORTER_ASSERT(reporter,
|
|
DoesFullBufferContainCorrectColor(srcBuffer, dstBuffer, kWidth, kHeight));
|
|
|
|
dstInfo = SkImageInfo::Make(4, 5, ct, kPremul_SkAlphaType);
|
|
result = sContext->writePixels(dstInfo, srcBuffer, 0, {5, 4});
|
|
REPORTER_ASSERT(reporter, result);
|
|
|
|
memset(dstBuffer, 0, kWidth*kHeight*sizeof(GrColor));
|
|
|
|
result = sContext->readPixels(dstInfo, dstBuffer, 0, {5, 4});
|
|
REPORTER_ASSERT(reporter, result);
|
|
|
|
REPORTER_ASSERT(reporter, DoesFullBufferContainCorrectColor(srcBuffer, dstBuffer, 4, 5));
|
|
|
|
}
|
|
}
|
|
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrUploadPixelsTests, reporter, ctxInfo) {
|
|
auto direct = ctxInfo.directContext();
|
|
|
|
// RGBA
|
|
basic_texture_test(reporter, direct, kRGBA_8888_SkColorType, GrRenderable::kNo);
|
|
basic_texture_test(reporter, direct, kRGBA_8888_SkColorType, GrRenderable::kYes);
|
|
|
|
// BGRA
|
|
basic_texture_test(reporter, direct, kBGRA_8888_SkColorType, GrRenderable::kNo);
|
|
basic_texture_test(reporter, direct, kBGRA_8888_SkColorType, GrRenderable::kYes);
|
|
}
|