4dca83162b
This CL is mostly mechanical. It:
replaces "src/gpu/GrSurfaceDrawContext.h" #includes with
"src/gpu/v1/SurfaceDrawContext_v1.h" and reorders
replaces "class GrSurfaceDrawContext;" with
"namespace skgpu { namespace v1 { class SurfaceDrawContext; }}"
replaces "GrSurfaceDrawContext*" with "auto" where possible
replaces "rtc" with "sdc"
replaces "surfaceDrawContext" with "sdc"
replaces GrSurfaceDrawContext with skgpu::v1::SurfaceDrawContext
reflows parameters as needed
This CL does not try to:
make skgpu::v1::SurfaceDrawContext V1-only
minimize the skgpu and/or skgpu::v1 prefixes
Those two tasks will be accomplished in follow up CLs. This CL is just trying to get the bulk of the mechanical changes comprehensibly landed.
Bug: skia:11837
Change-Id: I6fe59080249d585df8f5d27c6b67569cdc35842f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/433156
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
74 lines
2.5 KiB
C++
74 lines
2.5 KiB
C++
/*
|
|
* Copyright 2016 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.
|
|
|
|
#include "tests/Test.h"
|
|
|
|
#include "include/gpu/GrDirectContext.h"
|
|
#include "src/gpu/GrDirectContextPriv.h"
|
|
#include "src/gpu/GrImageInfo.h"
|
|
#include "src/gpu/GrTextureProxy.h"
|
|
#include "src/gpu/v1/SurfaceDrawContext_v1.h"
|
|
|
|
static const int kSize = 64;
|
|
|
|
static std::unique_ptr<skgpu::v1::SurfaceDrawContext> get_sdc(GrRecordingContext* rContext) {
|
|
return skgpu::v1::SurfaceDrawContext::Make(rContext, GrColorType::kRGBA_8888, nullptr,
|
|
SkBackingFit::kExact, {kSize, kSize},
|
|
SkSurfaceProps());
|
|
}
|
|
|
|
static void check_instantiation_status(skiatest::Reporter* reporter,
|
|
skgpu::v1::SurfaceDrawContext* sdc,
|
|
bool wrappedExpectation) {
|
|
REPORTER_ASSERT(reporter, sdc->asRenderTargetProxy()->isInstantiated() == wrappedExpectation);
|
|
|
|
GrTextureProxy* tProxy = sdc->asTextureProxy();
|
|
REPORTER_ASSERT(reporter, tProxy);
|
|
|
|
REPORTER_ASSERT(reporter, tProxy->isInstantiated() == wrappedExpectation);
|
|
}
|
|
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SurfaceDrawContextTest, reporter, ctxInfo) {
|
|
auto dContext = ctxInfo.directContext();
|
|
|
|
// Calling instantiate on a SurfaceDrawContext's textureProxy also instantiates the
|
|
// SurfaceDrawContext
|
|
{
|
|
auto sdc = get_sdc(dContext);
|
|
|
|
check_instantiation_status(reporter, sdc.get(), false);
|
|
|
|
GrTextureProxy* tProxy = sdc->asTextureProxy();
|
|
REPORTER_ASSERT(reporter, tProxy);
|
|
|
|
REPORTER_ASSERT(reporter, tProxy->instantiate(dContext->priv().resourceProvider()));
|
|
|
|
check_instantiation_status(reporter, sdc.get(), true);
|
|
}
|
|
|
|
// readPixels switches a deferred sdCtx to wrapped
|
|
{
|
|
auto sdc = get_sdc(dContext);
|
|
|
|
check_instantiation_status(reporter, sdc.get(), false);
|
|
|
|
SkImageInfo dstInfo = SkImageInfo::MakeN32Premul(kSize, kSize);
|
|
GrPixmap dstPM = GrPixmap::Allocate(dstInfo);
|
|
|
|
bool result = sdc->readPixels(dContext, dstPM, {0, 0});
|
|
REPORTER_ASSERT(reporter, result);
|
|
|
|
check_instantiation_status(reporter, sdc.get(), true);
|
|
}
|
|
|
|
// TODO: in a future world we should be able to add a test that the majority of
|
|
// SurfaceDrawContext calls do not force the instantiation of a deferred
|
|
// SurfaceDrawContext
|
|
}
|