c3bfcb803a
Reason for revert: broke build. See https://build.chromium.org/p/client.skia/builders/Perf-Win8-MSVC-ShuttleA-GPU-GTX960-x86_64-Debug/builds/186 Original issue's description: > Improve usage of window rectangles > > * Skips non-AA diff rect elements and replaces them with window > rectangles. > * Places window rectangles in the interiors of antialiased diff rects. > * Arranges two overlapping window rectangles in a plus shape inside of > diff rounded rects. > * Enables window rectangles when clearing and generating clip masks. > > GTX 960 perf result (with vs. without window rectangles): > > glinst4 msaa16 gpu > keymobi_pinterest.skp 0.48 -> 0.17 [ 35%] 2.77 -> 1.49 [ 54%] 0.22 -> 0.16 [ 70%] > keymobi_digg_com.skp 0.42 -> 0.23 [ 55%] 2.34 -> 1.08 [ 46%] 0.25 -> 0.21 [ 83%] > desk_jsfiddlebigcar.skp 0.28 -> 0.16 [ 59%] 1.70 -> 0.96 [ 57%] 0.19 -> 0.14 [ 70%] > top25desk_wordpress.skp 0.45 -> 0.18 [ 40%] 2.78 -> 1.53 [ 55%] 0.21 -> 0.19 [ 94%] > top25desk_weather_com.skp 2.01 -> 1.93 [ 96%] 23.5 -> 2.54 [ 11%] 1.90 -> 1.68 [ 88%] > keymobi_blogger.skp 0.57 -> 0.37 [ 65%] 2.87 -> 1.54 [ 54%] 0.43 -> 0.33 [ 77%] > keymobi_linkedin.skp 0.32 -> 0.17 [ 51%] 1.93 -> 1.04 [ 54%] 0.17 -> 0.15 [ 91%] > keymobi_bing_com_search_... 0.29 -> 0.25 [ 83%] 1.85 -> 1.23 [ 66%] 0.50 -> 0.24 [ 48%] > keymobi_theverge_com_201... 1.00 -> 0.67 [ 68%] 9.46 -> 3.84 [ 41%] 0.72 -> 0.65 [ 90%] > keymobi_sfgate_com_.skp 1.56 -> 1.13 [ 72%] 4.49 -> 2.86 [ 64%] 1.54 -> 1.11 [ 72%] > keymobi_ftw_usatoday_com... 0.59 -> 0.34 [ 57%] 2.80 -> 1.54 [ 55%] 1.21 -> 1.20 [ 99%] > keymobi_shop_mobileweb_e... 0.46 -> 0.32 [ 70%] 2.60 -> 1.26 [ 48%] 0.35 -> 0.34 [ 97%] > keymobi_cnn_com.skp 0.68 -> 0.42 [ 63%] 3.40 -> 2.10 [ 62%] 0.49 -> 0.45 [ 93%] > keymobi_plus_google_com_... 0.77 -> 0.46 [ 60%] 4.83 -> 3.56 [ 74%] 0.52 -> 0.46 [ 89%] > keymobi_wordpress.skp 0.50 -> 0.40 [ 81%] 2.60 -> 1.31 [ 50%] 0.40 -> 0.37 [ 91%] > keymobi_androidpolice_co... 0.84 -> 0.73 [ 87%] 4.15 -> 2.05 [ 49%] 0.77 -> 0.67 [ 87%] > keymobi_online_wsj_com_h... 0.55 -> 0.43 [ 78%] 2.91 -> 1.66 [ 57%] 0.45 -> 0.41 [ 90%] > keymobi_iphone_capitolvo... 1.18 -> 0.96 [ 81%] 6.26 -> 4.96 [ 79%] 0.95 -> 0.92 [ 97%] > keymobi_wikipedia__1_tab... 0.46 -> 0.41 [ 89%] 2.51 -> 1.24 [ 49%] 0.40 -> 0.38 [ 95%] > keymobi_wikipedia__1_tab... 0.46 -> 0.42 [ 90%] 2.52 -> 1.25 [ 50%] 0.40 -> 0.38 [ 96%] > keymobi_boingboing_net.skp 0.62 -> 0.56 [ 90%] 3.15 -> 1.80 [ 57%] 0.61 -> 0.56 [ 92%] > keymobi_cnn_com_2012_10_... 0.86 -> 0.82 [ 95%] 2.81 -> 1.50 [ 53%] 0.91 -> 0.83 [ 91%] > top25desk_techcrunch_com... 0.61 -> 0.56 [ 92%] 3.03 -> 1.76 [ 58%] 0.62 -> 0.56 [ 91%] > top25desk_ebay_com.skp 1.18 -> 1.08 [ 92%] 2.23 -> 1.24 [ 56%] 1.14 -> 1.09 [ 96%] > desk_css3gradients.skp 0.64 -> 0.61 [ 95%] 2.99 -> 1.54 [ 52%] 0.62 -> 0.61 [ 99%] > top25desk_blogger.skp 0.61 -> 0.59 [ 96%] 2.50 -> 1.37 [ 55%] 0.60 -> 0.57 [ 95%] > keymobi_nytimes_com_.skp 0.65 -> 0.64 [ 98%] 2.69 -> 1.42 [ 53%] 0.62 -> 0.59 [ 96%] > keymobi_wowwiki_com_worl... 0.99 -> 0.92 [ 92%] 3.46 -> 2.06 [ 60%] 0.98 -> 0.95 [ 96%] > keymobi_cuteoverload_com... 1.37 -> 1.26 [ 92%] 3.24 -> 2.45 [ 76%] 1.38 -> 1.35 [ 98%] > keymobi_mobile_news_sand... 0.88 -> 0.81 [ 93%] 3.50 -> 2.07 [ 59%] 0.82 -> 0.81 [100%] > top25desk_linkedin.skp 0.87 -> 0.87 [100%] 2.92 -> 1.73 [ 59%] 0.94 -> 0.86 [ 91%] > top25desk_docs___1_open_... 1.43 -> 1.36 [ 95%] 1.87 -> 1.42 [ 76%] 0.73 -> 0.66 [ 91%] > keymobi_reddit_com_r_pro... 0.68 -> 0.66 [ 96%] 2.49 -> 1.23 [ 49%] 0.65 -> 0.66 [102%] > ... > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2289363005 > > Committed: https://skia.googlesource.com/skia/+/db42be9a326c747ff92ed1da8c3536c5b3e8e22b TBR=bsalomon@google.com,egdaniel@google.com,robertphillips@google.com,csmartdalton@google.com # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=skia: Review-Url: https://codereview.chromium.org/2312173002
207 lines
9.7 KiB
C++
207 lines
9.7 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 "GrGpu.h"
|
|
#include "GrSurfaceProxy.h"
|
|
#include "GrTextureProxy.h"
|
|
#include "GrRenderTargetProxy.h"
|
|
|
|
// Check that the surface proxy's member vars are set as expected
|
|
static void check_surface(skiatest::Reporter* reporter,
|
|
GrSurfaceProxy* proxy,
|
|
GrSurfaceOrigin origin,
|
|
int width, int height,
|
|
GrPixelConfig config,
|
|
uint32_t uniqueID) {
|
|
REPORTER_ASSERT(reporter, proxy->origin() == origin);
|
|
REPORTER_ASSERT(reporter, proxy->width() == width);
|
|
REPORTER_ASSERT(reporter, proxy->height() == height);
|
|
REPORTER_ASSERT(reporter, proxy->config() == config);
|
|
if (SK_InvalidUniqueID != uniqueID) {
|
|
REPORTER_ASSERT(reporter, proxy->uniqueID() == uniqueID);
|
|
}
|
|
}
|
|
|
|
static void check_rendertarget(skiatest::Reporter* reporter,
|
|
GrTextureProvider* provider,
|
|
GrRenderTargetProxy* rtProxy,
|
|
SkBackingFit fit) {
|
|
REPORTER_ASSERT(reporter, rtProxy->asTextureProxy() == nullptr); // for now
|
|
REPORTER_ASSERT(reporter, rtProxy->asRenderTargetProxy() == rtProxy);
|
|
|
|
GrRenderTarget* rt = rtProxy->instantiate(provider);
|
|
REPORTER_ASSERT(reporter, rt);
|
|
|
|
REPORTER_ASSERT(reporter, rt->origin() == rtProxy->origin());
|
|
if (SkBackingFit::kExact == fit) {
|
|
REPORTER_ASSERT(reporter, rt->width() == rtProxy->width());
|
|
REPORTER_ASSERT(reporter, rt->height() == rtProxy->height());
|
|
} else {
|
|
REPORTER_ASSERT(reporter, rt->width() >= rtProxy->width());
|
|
REPORTER_ASSERT(reporter, rt->height() >= rtProxy->height());
|
|
}
|
|
REPORTER_ASSERT(reporter, rt->config() == rtProxy->config());
|
|
|
|
REPORTER_ASSERT(reporter, rt->isUnifiedMultisampled() == rtProxy->isUnifiedMultisampled());
|
|
REPORTER_ASSERT(reporter, rt->isStencilBufferMultisampled() ==
|
|
rtProxy->isStencilBufferMultisampled());
|
|
REPORTER_ASSERT(reporter, rt->numColorSamples() == rtProxy->numColorSamples());
|
|
REPORTER_ASSERT(reporter, rt->numStencilSamples() == rtProxy->numStencilSamples());
|
|
REPORTER_ASSERT(reporter, rt->isMixedSampled() == rtProxy->isMixedSampled());
|
|
REPORTER_ASSERT(reporter, rt->renderTargetPriv().flags() == rtProxy->testingOnly_getFlags());
|
|
}
|
|
|
|
static void check_texture(skiatest::Reporter* reporter,
|
|
GrTextureProvider* provider,
|
|
GrTextureProxy* texProxy,
|
|
SkBackingFit fit) {
|
|
REPORTER_ASSERT(reporter, texProxy->asTextureProxy() == texProxy);
|
|
REPORTER_ASSERT(reporter, texProxy->asRenderTargetProxy() == nullptr); // for now
|
|
|
|
GrTexture* tex = texProxy->instantiate(provider);
|
|
REPORTER_ASSERT(reporter, tex);
|
|
|
|
REPORTER_ASSERT(reporter, tex->origin() == texProxy->origin());
|
|
if (SkBackingFit::kExact == fit) {
|
|
REPORTER_ASSERT(reporter, tex->width() == texProxy->width());
|
|
REPORTER_ASSERT(reporter, tex->height() == texProxy->height());
|
|
} else {
|
|
REPORTER_ASSERT(reporter, tex->width() >= texProxy->width());
|
|
REPORTER_ASSERT(reporter, tex->height() >= texProxy->height());
|
|
}
|
|
REPORTER_ASSERT(reporter, tex->config() == texProxy->config());
|
|
}
|
|
|
|
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(DeferredProxyTest, reporter, ctxInfo) {
|
|
GrTextureProvider* provider = ctxInfo.grContext()->textureProvider();
|
|
|
|
for (auto origin : { kBottomLeft_GrSurfaceOrigin, kTopLeft_GrSurfaceOrigin }) {
|
|
for (auto widthHeight : { 100, 128 }) {
|
|
for (auto config : { kAlpha_8_GrPixelConfig, kRGBA_8888_GrPixelConfig }) {
|
|
for (auto fit : { SkBackingFit::kExact, SkBackingFit::kApprox }) {
|
|
for (auto budgeted : { SkBudgeted::kYes, SkBudgeted::kNo }) {
|
|
for (auto numSamples : { 0, 4}) {
|
|
bool renderable = ctxInfo.grContext()->caps()->isConfigRenderable(
|
|
config, numSamples > 0) &&
|
|
numSamples <= ctxInfo.grContext()->caps()->maxColorSampleCount();
|
|
|
|
GrSurfaceDesc desc;
|
|
desc.fOrigin = origin;
|
|
desc.fWidth = widthHeight;
|
|
desc.fHeight = widthHeight;
|
|
desc.fConfig = config;
|
|
desc.fSampleCnt = numSamples;
|
|
|
|
if (renderable) {
|
|
sk_sp<GrRenderTargetProxy> rtProxy(GrRenderTargetProxy::Make(
|
|
*ctxInfo.grContext()->caps(),
|
|
desc,
|
|
fit,
|
|
budgeted));
|
|
check_surface(reporter, rtProxy.get(), origin,
|
|
widthHeight, widthHeight, config, SK_InvalidUniqueID);
|
|
check_rendertarget(reporter, provider, rtProxy.get(), fit);
|
|
}
|
|
|
|
desc.fSampleCnt = 0;
|
|
|
|
sk_sp<GrTextureProxy> texProxy(GrTextureProxy::Make(desc,
|
|
fit,
|
|
budgeted));
|
|
check_surface(reporter, texProxy.get(), origin,
|
|
widthHeight, widthHeight, config, SK_InvalidUniqueID);
|
|
check_texture(reporter, provider, texProxy.get(), fit);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(WrappedProxyTest, reporter, ctxInfo) {
|
|
GrTextureProvider* provider = ctxInfo.grContext()->textureProvider();
|
|
const GrCaps& caps = *ctxInfo.grContext()->caps();
|
|
|
|
static const int kWidthHeight = 100;
|
|
|
|
for (auto origin : { kBottomLeft_GrSurfaceOrigin, kTopLeft_GrSurfaceOrigin }) {
|
|
for (auto config : { kAlpha_8_GrPixelConfig, kRGBA_8888_GrPixelConfig }) {
|
|
for (auto budgeted : { SkBudgeted::kYes, SkBudgeted::kNo }) {
|
|
for (auto numSamples: { 0, 4}) {
|
|
bool renderable = caps.isConfigRenderable(config, numSamples > 0);
|
|
|
|
GrSurfaceDesc desc;
|
|
desc.fOrigin = origin;
|
|
desc.fWidth = kWidthHeight;
|
|
desc.fHeight = kWidthHeight;
|
|
desc.fConfig = config;
|
|
desc.fSampleCnt = numSamples;
|
|
|
|
// External on-screen render target.
|
|
if (renderable && kOpenGL_GrBackend == ctxInfo.backend()) {
|
|
GrBackendRenderTargetDesc backendDesc;
|
|
backendDesc.fWidth = kWidthHeight;
|
|
backendDesc.fHeight = kWidthHeight;
|
|
backendDesc.fConfig = config;
|
|
backendDesc.fOrigin = origin;
|
|
backendDesc.fSampleCnt = numSamples;
|
|
backendDesc.fStencilBits = 8;
|
|
backendDesc.fRenderTargetHandle = 0;
|
|
|
|
GrGpu* gpu = ctxInfo.grContext()->getGpu();
|
|
sk_sp<GrRenderTarget> defaultFBO(
|
|
gpu->wrapBackendRenderTarget(backendDesc, kBorrow_GrWrapOwnership));
|
|
SkASSERT(!defaultFBO->renderTargetPriv().supportsWindowRectangles());
|
|
|
|
sk_sp<GrRenderTargetProxy> rtProxy(
|
|
GrRenderTargetProxy::Make(caps, defaultFBO));
|
|
check_surface(reporter, rtProxy.get(), origin,
|
|
kWidthHeight, kWidthHeight, config, defaultFBO->uniqueID());
|
|
check_rendertarget(reporter, provider, rtProxy.get(), SkBackingFit::kExact);
|
|
}
|
|
|
|
sk_sp<GrTexture> tex;
|
|
|
|
// Internal offscreen render target.
|
|
if (renderable) {
|
|
desc.fFlags = kRenderTarget_GrSurfaceFlag;
|
|
tex.reset(provider->createTexture(desc, budgeted));
|
|
sk_sp<GrRenderTarget> rt(sk_ref_sp(tex->asRenderTarget()));
|
|
SkASSERT(caps.maxWindowRectangles() <= 0 ||
|
|
rt->renderTargetPriv().supportsWindowRectangles());
|
|
|
|
sk_sp<GrRenderTargetProxy> rtProxy(GrRenderTargetProxy::Make(caps, rt));
|
|
check_surface(reporter, rtProxy.get(), origin,
|
|
kWidthHeight, kWidthHeight, config, rt->uniqueID());
|
|
check_rendertarget(reporter, provider, rtProxy.get(), SkBackingFit::kExact);
|
|
}
|
|
|
|
if (!tex) {
|
|
SkASSERT(kNone_GrSurfaceFlags == desc.fFlags );
|
|
desc.fSampleCnt = 0;
|
|
tex.reset(provider->createTexture(desc, budgeted));
|
|
}
|
|
|
|
sk_sp<GrTextureProxy> texProxy(GrTextureProxy::Make(tex));
|
|
check_surface(reporter, texProxy.get(), origin,
|
|
kWidthHeight, kWidthHeight, config, tex->uniqueID());
|
|
check_texture(reporter, provider, texProxy.get(), SkBackingFit::kExact);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#endif
|