diff options
| author |  robertphillips <robertphillips@google.com> | 2014-10-02 12:12:48 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-10-02 12:12:48 -0700 |
| commit | b4b7a4c9ea2e399db550f93e3754c351e5b2079a (patch) | |
| tree | f67932963699b8dac498d3e67f70cc2c505c70a3 /src/gpu/GrProcessor.cpp | |
| parent | 85d3427d4932c6cfaf02f8a7454f0c6f213b0c2e (diff) | |
Revert of Add isSingleComponent bool to getConstantColorComponent (patchset #6 id:100001 of https://codereview.chromium.org/608253002/)
Reason for revert:
Changing some GMs
Original issue's description:
> Add isSingleComponent bool to getConstantColorComponent
>
> Initial step to allowing effects to use/output 1 or 4 color/coverage components. This cl doesn't change any current logic and all effects still assume they are working with 4 components.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/3b8af078281a5a20f951b9fd84f38d92b8f6217b
TBR=joshualitt@chromium.org,bsalomon@google.com,reed@google.com,egdaniel@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/617853003
Diffstat (limited to 'src/gpu/GrProcessor.cpp')
| -rw-r--r-- | src/gpu/GrProcessor.cpp | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/src/gpu/GrProcessor.cpp b/src/gpu/GrProcessor.cpp index 26e00530be..45298b522d 100644 --- a/src/gpu/GrProcessor.cpp +++ b/src/gpu/GrProcessor.cpp @@ -88,46 +88,4 @@ void GrProcessor::assertEquality(const GrProcessor& other) const { SkASSERT(this->textureAccess(i) == other.textureAccess(i)); } } - -void GrProcessor::InvariantOutput::validate() const { - if (fIsSingleComponent) { - SkASSERT(0 == fValidFlags || kRGBA_GrColorComponentFlags == fValidFlags); - if (kRGBA_GrColorComponentFlags == fValidFlags) { - SkASSERT(this->colorComponentsAllEqual()); - } - } - - SkASSERT(this->validPreMulColor()); -} - -bool GrProcessor::InvariantOutput::colorComponentsAllEqual() const { - unsigned colorA = GrColorUnpackA(fColor); - return(GrColorUnpackR(fColor) == colorA && - GrColorUnpackG(fColor) == colorA && - GrColorUnpackB(fColor) == colorA); -} - -bool GrProcessor::InvariantOutput::validPreMulColor() const { - if (kA_GrColorComponentFlag & fValidFlags) { - float c[4]; - GrColorToRGBAFloat(fColor, c); - if (kR_GrColorComponentFlag & fValidFlags) { - if (c[0] > c[3]) { - return false; - } - } - if (kG_GrColorComponentFlag & fValidFlags) { - if (c[1] > c[3]) { - return false; - } - } - if (kB_GrColorComponentFlag & fValidFlags) { - if (c[2] > c[3]) { - return false; - } - } - } - return true; -} #endif - |