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

Limit GrClipStackClip tests to only exist when relevant

Browse Source 
As part of the new architecture I envision not compiling in stuff like
the GrClipStackClip when in NGA-mode. This ran/runs into trouble with
the unit tests.

Change-Id: I922dcf873c4bb1a3abfd2ce519f3dbf68e053770
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/392839
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
This commit is contained in:
Robert Phillips 2021-04-05 14:01:36 -04:00 committed by Skia Commit-Bot
parent acd28fc509
commit 8faa34089c
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/ClipBoundsTest.cpp
View File

@ -5,6 +5,11 @@
* found in the LICENSE file. * found in the LICENSE file.
*/ */
#include "src/gpu/SkGpuDevice.h"
// For the GrClipStack case, this is covered in GrClipStack_RectDeviceClip
#if defined(SK_DISABLE_NEW_GR_CLIP_STACK)
#include "include/core/SkMatrix.h" #include "include/core/SkMatrix.h"
#include "include/core/SkRect.h" #include "include/core/SkRect.h"
#include "src/core/SkClipOpPriv.h" #include "src/core/SkClipOpPriv.h"
@ -48,3 +53,5 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrClipBounds, reporter, ctxInfo) {
// make sure that GrClip is behaving itself // make sure that GrClip is behaving itself
REPORTER_ASSERT(reporter, intScreen == devGrClipBound); REPORTER_ASSERT(reporter, intScreen == devGrClipBound);
} }
#endif // SK_DISABLE_NEW_GR_CLIP_STACK

6
tests/ClipStackTest.cpp
View File

@ -1545,6 +1545,11 @@ DEF_TEST(ClipStack, reporter) {
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
#include "src/gpu/SkGpuDevice.h"
// For the GrClipStack case, this is covered in GrClipStack_SWMask
#if defined(SK_DISABLE_NEW_GR_CLIP_STACK)
sk_sp<GrTextureProxy> GrClipStackClip::testingOnly_createClipMask( sk_sp<GrTextureProxy> GrClipStackClip::testingOnly_createClipMask(
GrRecordingContext* context) const { GrRecordingContext* context) const {
const GrReducedClip reducedClip(*fStack, SkRect::MakeWH(512, 512), nullptr); const GrReducedClip reducedClip(*fStack, SkRect::MakeWH(512, 512), nullptr);
@ -1593,3 +1598,4 @@ DEF_GPUTEST_FOR_ALL_CONTEXTS(ClipMaskCache, reporter, ctxInfo) {
} }
#endif #endif
} }
#endif // SK_DISABLE_NEW_GR_CLIP_STACK