b37208f11a
This reverts commit05814de6ba
. Reason for revert: Chrome layout test suppressions have landed Original change's description: > Revert "Re-enable deferred proxies in Chrome" > > This reverts commit555c49c347
. > > Reason for revert: layout tests > > Original change's description: > > Re-enable deferred proxies in Chrome > > > > Now that https://skia-review.googlesource.com/c/14605/ (Allow TextureSamplers to have null GrTexture pointer) has landed we should be able to re-enable deferred proxies in Chrome. > > > > Bug: 715488 > > Change-Id: Ibd38e5ddf0558b94f09e29f17837e6abfd22fa34 > > Reviewed-on: https://skia-review.googlesource.com/15252 > > Reviewed-by: Brian Salomon <bsalomon@google.com> > > Commit-Queue: Robert Phillips <robertphillips@google.com> > > > > TBR=bsalomon@google.com,robertphillips@google.com > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > > Change-Id: Ie90e64a2e4d5efc4b6909a04f8a862dd3a708d97 > Reviewed-on: https://skia-review.googlesource.com/15809 > Reviewed-by: Robert Phillips <robertphillips@google.com> > Commit-Queue: Robert Phillips <robertphillips@google.com> > TBR=bsalomon@google.com,robertphillips@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I957e8e59af2b2f441c75bae2eda4dcd5ed82b34d Reviewed-on: https://skia-review.googlesource.com/15876 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Robert Phillips <robertphillips@google.com>
194 lines
6.3 KiB
C++
194 lines
6.3 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 "GrRenderTargetPriv.h"
|
|
#include "GrRenderTargetProxy.h"
|
|
#include "GrResourceProvider.h"
|
|
#include "GrSurfaceProxy.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) {
|
|
SkASSERT(!fPendingReads);
|
|
return fTarget->fPendingReads;
|
|
}
|
|
|
|
return fPendingReads;
|
|
}
|
|
|
|
int32_t GrIORefProxy::getPendingWriteCnt_TestOnly() const {
|
|
if (fTarget) {
|
|
SkASSERT(!fPendingWrites);
|
|
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
|