AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Enable novel GrClipStack on bots, disable elsewhere"

Browse Source 
This reverts commit e1ade2ac4a.

Reason for revert: Need to remove benchmarks that use deprecated SkClipOps first.

Original change's description:
> Enable novel GrClipStack on bots, disable elsewhere
> 
> As a result of this change, the new GrClipStack will run on all of our
> default bots. However, the SK_DISABLE_NEW_GR_CLICK_STACK define is used
> to explicitly disable the clip stack when we build for the Android
> Framework, Google3, Flutter, and Fuchsia. These projects can have staging
> controlled from within the skia repo. This CL in chromium also disables
> the new clip stack: https://chromium-review.googlesource.com/c/chromium/src/+/2412768
> and must land before this CL does in Skia.
> 
> When GrClipStack originally landed, I had it disabled by checking the
> value of the define SK_USE_NEW_GR_CLICK_STACK for 0 or 1. To be a little
> simpler, and work with the flutter and fuchsia gn defines, this CL
> switches GrClipStack control over to SK_DISABLE_NEW_GR_CLICK_STACK and
> it just checks for whether or not it's defined.
> 
> Bug: skia:10205
> Change-Id: I6b8bd18290844c02839fe99fdf629b48ffd86f27
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317209
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Michael Ludwig <michaelludwig@google.com>

TBR=bsalomon@google.com,robertphillips@google.com,michaelludwig@google.com

Change-Id: I14fddccfdea8e91ebad92e55193b0034f8bb28af
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:10205
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/317377
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Michael Ludwig <michaelludwig@google.com>
This commit is contained in:
Michael Ludwig 2020-09-16 16:55:38 +00:00 committed by Skia Commit-Bot
parent d85b15942c
commit f6e0f58b2e
5 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
RELEASE_NOTES.txt
View File

@ -9,12 +9,6 @@ Milestone 87
* <insert new release notes here>
* New optimized clip stack for GPU backends. Enabled by default but old behavior based on
SkClipStack can be restored by defining SK_DISABLE_NEW_GR_CLIP_STACK when building. It is not
compatible with SK_SUPPORT_DEPRECATED_CLIPOPS and we are targeting the removal of support for
the deprecated, expanding clip ops.
https://review.skia.org/317209
* Alternate SkImage::MakeFromYUVAPixmaps signature. Takes SkYUVAPixmaps, which specifies
planar configuration in a more structured manner. Currently limited to tri-planar
configurations without alpha but will be expanded. Older signature will become

1
gn/flutter_defines.gni
View File

@ -16,7 +16,6 @@ flutter_defines = [
# Staging
"SK_SUPPORT_LEGACY_MATRIX_FACTORIES",
"SK_DISABLE_NEW_GR_CLIP_STACK",
# Fast low-precision software rendering isn't a priority for Flutter.
"SK_DISABLE_LEGACY_SHADERCONTEXT",

5
gn/fuchsia_defines.gni
View File

@ -3,7 +3,4 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
fuchsia_defines = [
# Staging
"SK_DISABLE_NEW_GR_CLIP_STACK",
]
fuchsia_defines = []

4
src/gpu/SkGpuDevice.cpp
View File

@ -130,7 +130,7 @@ SkGpuDevice::SkGpuDevice(GrRecordingContext* context,
renderTargetContext->surfaceProps())
, fContext(SkRef(context))
, fRenderTargetContext(std::move(renderTargetContext))
#if !defined(SK_DISABLE_NEW_GR_CLIP_STACK)
#if SK_USE_NEW_GR_CLIP_STACK
, fClip(SkIRect::MakeWH(fRenderTargetContext->width(),
fRenderTargetContext->height()),
&this->asMatrixProvider(),
@ -251,7 +251,7 @@ void SkGpuDevice::replaceRenderTargetContext(SkSurface::ContentChangeMode mode)
///////////////////////////////////////////////////////////////////////////////
#if !defined(SK_DISABLE_NEW_GR_CLIP_STACK)
#if SK_USE_NEW_GR_CLIP_STACK
void SkGpuDevice::onClipRegion(const SkRegion& globalRgn, SkClipOp op) {
SkASSERT(op == SkClipOp::kIntersect || op == SkClipOp::kDifference);

13
src/gpu/SkGpuDevice.h
View File

@ -25,17 +25,14 @@ class SkSpecialImage;
class SkSurface;
class SkVertices;
// NOTE: when not defined, SkGpuDevice extends SkBaseDevice directly and manages its clip stack
#ifndef SK_USE_NEW_GR_CLIP_STACK
// NOTE: If this is non-zero, SkGpuDevice extends SkBaseDevice directly and manages its clip stack
// using GrClipStack. When false, SkGpuDevice continues to extend SkClipStackDevice and uses
// SkClipStack and GrClipStackClip to manage the clip stack.
#if !defined(SK_DISABLE_NEW_GR_CLIP_STACK)
// For staging purposes, disable this for Android Framework and Google3
#if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) || defined(SK_BUILD_FOR_GOOGLE3)
#define SK_DISABLE_NEW_GR_CLIP_STACK
#endif
#define SK_USE_NEW_GR_CLIP_STACK 0
#endif
#if !defined(SK_DISABLE_NEW_GR_CLIP_STACK)
#if SK_USE_NEW_GR_CLIP_STACK
#include "src/core/SkDevice.h"
#include "src/gpu/GrClipStack.h"
#define BASE_DEVICE SkBaseDevice
@ -146,7 +143,7 @@ protected:
bool onReadPixels(const SkPixmap&, int, int) override;
bool onWritePixels(const SkPixmap&, int, int) override;
#if !defined(SK_DISABLE_NEW_GR_CLIP_STACK)
#if SK_USE_NEW_GR_CLIP_STACK
void onSave() override { fClip.save(); }
void onRestore() override { fClip.restore(); }