aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/effects
diff options
context:
space:
mode:
authorGravatar bsalomon <bsalomon@google.com>2015-05-11 11:21:14 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-05-11 11:21:14 -0700
commitf7cc87719e53df86784d0d953b88c45a3be38953 (patch)
treeb0c7e643d17625a931bc9f8b662580d71ff6f104 /src/gpu/effects
parent8e5c177c8589e00f630ac6fae763c65cb9cae896 (diff)
Add function for logging blend info on XP.
Diffstat (limited to 'src/gpu/effects')
-rw-r--r--src/gpu/effects/GrCustomXfermode.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/effects/GrCustomXfermode.cpp b/src/gpu/effects/GrCustomXfermode.cpp
index 0a525b4d92..4963198e7e 100644
--- a/src/gpu/effects/GrCustomXfermode.cpp
+++ b/src/gpu/effects/GrCustomXfermode.cpp
@@ -48,7 +48,7 @@ static GrBlendEquation hw_blend_equation(SkXfermode::Mode mode) {
GR_STATIC_ASSERT(kHSLSaturation_GrBlendEquation == SkXfermode::kSaturation_Mode + kOffset);
GR_STATIC_ASSERT(kHSLColor_GrBlendEquation == SkXfermode::kColor_Mode + kOffset);
GR_STATIC_ASSERT(kHSLLuminosity_GrBlendEquation == SkXfermode::kLuminosity_Mode + kOffset);
- GR_STATIC_ASSERT(kTotalGrBlendEquationCount == SkXfermode::kLastMode + 1 + kOffset);
+ GR_STATIC_ASSERT(kGrBlendEquationCnt == SkXfermode::kLastMode + 1 + kOffset);
}
static void hard_light(GrGLFragmentBuilder* fsBuilder,
@@ -526,7 +526,7 @@ public:
bool hasSecondaryOutput() const override { return false; }
SkXfermode::Mode mode() const { return fMode; }
- bool hasHWBlendEquation() const { return kInvalid_GrBlendEquation != fHWBlendEquation; }
+ bool hasHWBlendEquation() const { return -1 != static_cast<int>(fHWBlendEquation); }
GrBlendEquation hwBlendEquation() const {
SkASSERT(this->hasHWBlendEquation());
@@ -630,7 +630,7 @@ CustomXP::CustomXP(SkXfermode::Mode mode, const GrDeviceCoordTexture* dstCopy,
bool willReadDstColor)
: INHERITED(dstCopy, willReadDstColor),
fMode(mode),
- fHWBlendEquation(kInvalid_GrBlendEquation) {
+ fHWBlendEquation(static_cast<GrBlendEquation>(-1)) {
this->initClassID<CustomXP>();
}