96be9df130
This reverts commit 467022b186
.
Reason for revert: GrAHardwareBufferImageGenerator.cpp
Original change's description:
> Reduce dependence on GrSurface's origin field
>
> Unfortunately, GrGPU and its ilk are still using the GrSurface's origin a lot. I will clean that up in a second CL.
>
> Change-Id: Iba729440ce8ea8d24bb7f4e5de55ed576a0f176d
> Reviewed-on: https://skia-review.googlesource.com/24700
> Commit-Queue: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com,robertphillips@google.com
Change-Id: I1b3f5c3b82d250ac164beb1d5c83abb6c3c6ab3b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/25620
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
193 lines
6.2 KiB
C++
193 lines
6.2 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 "Test.h"
|
|
|
|
#if SK_SUPPORT_GPU
|
|
#include "GrContextPriv.h"
|
|
#include "GrGpuResourceRef.h"
|
|
#include "GrRenderTargetProxy.h"
|
|
#include "GrResourceProvider.h"
|
|
#include "GrSurfaceProxy.h"
|
|
#include "GrTexture.h"
|
|
#include "GrTextureProxy.h"
|
|
|
|
int32_t GrIORefProxy::getProxyRefCnt_TestOnly() const {
|
|
return fRefCnt;
|
|
}
|
|
|
|
int32_t GrIORefProxy::getBackingRefCnt_TestOnly() const {
|
|
if (fTarget) {
|
|
return fTarget->fRefCnt;
|
|
}
|
|
|
|
return fRefCnt;
|
|
}
|
|
|
|
int32_t GrIORefProxy::getPendingReadCnt_TestOnly() const {
|
|
if (fTarget) {
|
|
return fTarget->fPendingReads;
|
|
}
|
|
|
|
return fPendingReads;
|
|
}
|
|
|
|
int32_t GrIORefProxy::getPendingWriteCnt_TestOnly() const {
|
|
if (fTarget) {
|
|
return fTarget->fPendingWrites;
|
|
}
|
|
|
|
return fPendingWrites;
|
|
}
|
|
|
|
static const int kWidthHeight = 128;
|
|
|
|
static void check_refs(skiatest::Reporter* reporter,
|
|
GrTextureProxy* proxy,
|
|
int32_t expectedProxyRefs,
|
|
int32_t expectedBackingRefs,
|
|
int32_t expectedNumReads,
|
|
int32_t expectedNumWrites) {
|
|
REPORTER_ASSERT(reporter, proxy->getProxyRefCnt_TestOnly() == expectedProxyRefs);
|
|
REPORTER_ASSERT(reporter, proxy->getBackingRefCnt_TestOnly() == expectedBackingRefs);
|
|
REPORTER_ASSERT(reporter, proxy->getPendingReadCnt_TestOnly() == expectedNumReads);
|
|
REPORTER_ASSERT(reporter, proxy->getPendingWriteCnt_TestOnly() == expectedNumWrites);
|
|
|
|
SkASSERT(proxy->getProxyRefCnt_TestOnly() == expectedProxyRefs);
|
|
SkASSERT(proxy->getBackingRefCnt_TestOnly() == expectedBackingRefs);
|
|
SkASSERT(proxy->getPendingReadCnt_TestOnly() == expectedNumReads);
|
|
SkASSERT(proxy->getPendingWriteCnt_TestOnly() == expectedNumWrites);
|
|
}
|
|
|
|
static sk_sp<GrTextureProxy> make_deferred(GrContext* context) {
|
|
GrSurfaceDesc desc;
|
|
desc.fFlags = kRenderTarget_GrSurfaceFlag;
|
|
desc.fWidth = kWidthHeight;
|
|
desc.fHeight = kWidthHeight;
|
|
desc.fConfig = kRGBA_8888_GrPixelConfig;
|
|
|
|
return GrSurfaceProxy::MakeDeferred(context->resourceProvider(), desc,
|
|
SkBackingFit::kApprox, SkBudgeted::kYes,
|
|
GrResourceProvider::kNoPendingIO_Flag);
|
|
}
|
|
|
|
static sk_sp<GrTextureProxy> make_wrapped(GrContext* context) {
|
|
GrSurfaceDesc desc;
|
|
desc.fFlags = kRenderTarget_GrSurfaceFlag;
|
|
desc.fWidth = kWidthHeight;
|
|
desc.fHeight = kWidthHeight;
|
|
desc.fConfig = kRGBA_8888_GrPixelConfig;
|
|
|
|
sk_sp<GrTexture> tex(context->resourceProvider()->createTexture(desc, SkBudgeted::kNo));
|
|
|
|
return GrSurfaceProxy::MakeWrapped(std::move(tex));
|
|
}
|
|
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ProxyRefTest, reporter, ctxInfo) {
|
|
GrResourceProvider* provider = ctxInfo.grContext()->resourceProvider();
|
|
|
|
for (auto make : { make_deferred, make_wrapped }) {
|
|
// A single write
|
|
{
|
|
sk_sp<GrTextureProxy> proxy((*make)(ctxInfo.grContext()));
|
|
|
|
GrPendingIOResource<GrSurfaceProxy, kWrite_GrIOType> fWrite(proxy.get());
|
|
|
|
static const int kExpectedReads = 0;
|
|
static const int kExpectedWrites = 1;
|
|
|
|
check_refs(reporter, proxy.get(), 1, 1, kExpectedReads, kExpectedWrites);
|
|
|
|
proxy->instantiate(provider);
|
|
|
|
// In the deferred case, this checks that the refs transfered to the GrSurface
|
|
check_refs(reporter, proxy.get(), 1, 1, kExpectedReads, kExpectedWrites);
|
|
}
|
|
|
|
// A single read
|
|
{
|
|
sk_sp<GrTextureProxy> proxy((*make)(ctxInfo.grContext()));
|
|
|
|
GrPendingIOResource<GrSurfaceProxy, kRead_GrIOType> fRead(proxy.get());
|
|
|
|
static const int kExpectedReads = 1;
|
|
static const int kExpectedWrites = 0;
|
|
|
|
check_refs(reporter, proxy.get(), 1, 1, kExpectedReads, kExpectedWrites);
|
|
|
|
proxy->instantiate(provider);
|
|
|
|
// In the deferred case, this checks that the refs transfered to the GrSurface
|
|
check_refs(reporter, proxy.get(), 1, 1, kExpectedReads, kExpectedWrites);
|
|
}
|
|
|
|
// A single read/write pair
|
|
{
|
|
sk_sp<GrTextureProxy> proxy((*make)(ctxInfo.grContext()));
|
|
|
|
GrPendingIOResource<GrSurfaceProxy, kRW_GrIOType> fRW(proxy.get());
|
|
|
|
static const int kExpectedReads = 1;
|
|
static const int kExpectedWrites = 1;
|
|
|
|
check_refs(reporter, proxy.get(), 1, 1, kExpectedReads, kExpectedWrites);
|
|
|
|
proxy->instantiate(provider);
|
|
|
|
// In the deferred case, this checks that the refs transferred to the GrSurface
|
|
check_refs(reporter, proxy.get(), 1, 1, kExpectedReads, kExpectedWrites);
|
|
}
|
|
|
|
// Multiple normal refs
|
|
{
|
|
sk_sp<GrTextureProxy> proxy((*make)(ctxInfo.grContext()));
|
|
proxy->ref();
|
|
proxy->ref();
|
|
|
|
static const int kExpectedReads = 0;
|
|
static const int kExpectedWrites = 0;
|
|
|
|
check_refs(reporter, proxy.get(), 3, 3,kExpectedReads, kExpectedWrites);
|
|
|
|
proxy->instantiate(provider);
|
|
|
|
// In the deferred case, this checks that the refs transferred to the GrSurface
|
|
check_refs(reporter, proxy.get(), 3, 3, kExpectedReads, kExpectedWrites);
|
|
|
|
proxy->unref();
|
|
proxy->unref();
|
|
}
|
|
|
|
// Continue using (reffing) proxy after instantiation
|
|
{
|
|
sk_sp<GrTextureProxy> proxy((*make)(ctxInfo.grContext()));
|
|
proxy->ref();
|
|
|
|
GrPendingIOResource<GrSurfaceProxy, kWrite_GrIOType> fWrite(proxy.get());
|
|
|
|
static const int kExpectedWrites = 1;
|
|
|
|
check_refs(reporter, proxy.get(), 2, 2, 0, kExpectedWrites);
|
|
|
|
proxy->instantiate(provider);
|
|
|
|
// In the deferred case, this checks that the refs transfered to the GrSurface
|
|
check_refs(reporter, proxy.get(), 2, 2, 0, kExpectedWrites);
|
|
|
|
proxy->unref();
|
|
check_refs(reporter, proxy.get(), 1, 1, 0, kExpectedWrites);
|
|
|
|
GrPendingIOResource<GrSurfaceProxy, kRead_GrIOType> fRead(proxy.get());
|
|
check_refs(reporter, proxy.get(), 1, 1, 1, kExpectedWrites);
|
|
}
|
|
}
|
|
}
|
|
|
|
#endif
|