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

Clean up GrStrokeIndirectOp #ifs for using SIMD

Browse Source 
Bug: skia:10419
Change-Id: Ifc1507e554405fb6fbebca1bbf9da5e9ba691640
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/347137
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
This commit is contained in:
Chris Dalton 2020-12-23 11:55:35 -07:00 committed by Skia Commit-Bot
parent a992579692
commit 61f17c10d6
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gpu/tessellate/GrStrokeIndirectOp.cpp
View File

@ -41,7 +41,14 @@ void GrStrokeIndirectOp::onPrePrepare(GrRecordingContext* context,
// Helpers for GrStrokeIndirectOp::prePrepareResolveLevels. // Helpers for GrStrokeIndirectOp::prePrepareResolveLevels.
namespace { namespace {
#ifndef SKNX_NO_SIMD // Only use SIMD if SkVx will use a built-in compiler extensions for vectors.
#if !defined(SKNX_NO_SIMD) && (defined(__clang__) || defined(__GNUC__))
#define USE_SIMD 1
#else
#define USE_SIMD 0
#endif
#if USE_SIMD
using grvx::vec; using grvx::vec;
using grvx::ivec; using grvx::ivec;
using grvx::uvec; using grvx::uvec;
@ -83,7 +90,7 @@ public:
int* resolveLevelCounts) int* resolveLevelCounts)
: fIsRoundJoin(stroke.getJoin() == SkPaint::kRound_Join) : fIsRoundJoin(stroke.getJoin() == SkPaint::kRound_Join)
, fTolerances(tolerances) , fTolerances(tolerances)
#ifndef SKNX_NO_SIMD #if USE_SIMD
, fWangsTermQuadratic( , fWangsTermQuadratic(
GrWangsFormula::length_term<2>(fTolerances.fParametricIntolerance)) GrWangsFormula::length_term<2>(fTolerances.fParametricIntolerance))
, fWangsTermCubic(GrWangsFormula::length_term<3>(fTolerances.fParametricIntolerance)) , fWangsTermCubic(GrWangsFormula::length_term<3>(fTolerances.fParametricIntolerance))
@ -93,7 +100,7 @@ public:
bool isRoundJoin() const { return fIsRoundJoin; } bool isRoundJoin() const { return fIsRoundJoin; }
#ifdef SKNX_NO_SIMD #if !USE_SIMD
bool SK_WARN_UNUSED_RESULT countLine(const SkPoint pts[2], SkPoint lastControlPoint, bool SK_WARN_UNUSED_RESULT countLine(const SkPoint pts[2], SkPoint lastControlPoint,
int8_t* resolveLevelPtr) { int8_t* resolveLevelPtr) {
if (!fIsRoundJoin) { if (!fIsRoundJoin) {
@ -150,7 +157,7 @@ private:
++fResolveLevelCounts[(*resolveLevelPtr = resolveLevel)]; ++fResolveLevelCounts[(*resolveLevelPtr = resolveLevel)];
} }
#else // !defined(SKNX_NO_SIMD) #else // USE_SIMD
~ResolveLevelCounter() { ~ResolveLevelCounter() {
// Always call flush() when finished. // Always call flush() when finished.
SkASSERT(fLineQueue.fCount == 0); SkASSERT(fLineQueue.fCount == 0);
@ -402,7 +409,7 @@ private:
const bool fIsRoundJoin; const bool fIsRoundJoin;
GrStrokeTessellateShader::Tolerances fTolerances; GrStrokeTessellateShader::Tolerances fTolerances;
#ifndef SKNX_NO_SIMD #if USE_SIMD
const float fWangsTermQuadratic; const float fWangsTermQuadratic;
const float fWangsTermCubic; const float fWangsTermCubic;