diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-10-03 17:15:28 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-10-03 21:39:33 +0000 |
| commit | 2ebd0c80a2a9d90a2c2c653f40a2a7205bd2d31b (patch) | |
| tree | 1baafac8edfb1d5d51e9ea53b176b95506e809cd /src/gpu/GrPrimitiveProcessor.cpp | |
| parent | 2cbcd12281ee807214df094964c584c78932e10b (diff) | |
Remove option to make GrCoordTransforms apply to device positions.
Adds a device space texture decal effect to use for clipping.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2870
Change-Id: Ifcc7617ea87f5a86e301995cba9dfc30a4b0e2c5
Reviewed-on: https://skia-review.googlesource.com/2870
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/GrPrimitiveProcessor.cpp')
| -rw-r--r-- | src/gpu/GrPrimitiveProcessor.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/gpu/GrPrimitiveProcessor.cpp b/src/gpu/GrPrimitiveProcessor.cpp index 180217e261..2aaaa0474f 100644 --- a/src/gpu/GrPrimitiveProcessor.cpp +++ b/src/gpu/GrPrimitiveProcessor.cpp @@ -21,7 +21,6 @@ enum { kPrecisionShift = kMatrixTypeKeyBits, kPositionCoords_Flag = (1 << (kPrecisionShift + kPrecisionBits)), - kDeviceCoords_Flag = kPositionCoords_Flag + kPositionCoords_Flag, kTransformKeyBits = kMatrixTypeKeyBits + kPrecisionBits + 2, }; @@ -49,11 +48,8 @@ GrPrimitiveProcessor::getTransformKey(const SkTArray<const GrCoordTransform*, tr key |= kNoPersp_MatrixType; } - if (kLocal_GrCoordSet == coordTransform->sourceCoords() && - !this->hasExplicitLocalCoords()) { + if (!this->hasExplicitLocalCoords()) { key |= kPositionCoords_Flag; - } else if (kDevice_GrCoordSet == coordTransform->sourceCoords()) { - key |= kDeviceCoords_Flag; } GR_STATIC_ASSERT(kGrSLPrecisionCount <= (1 << kPrecisionBits)); |