aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/shaders
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2018-02-01 11:24:53 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-02-01 18:19:00 +0000
commit28eaed254dcd73b42c15b73528f349cccd7797e5 (patch)
treea344776f400032405b2496eb158a6912d01ea8e0 /src/shaders
parent48825b11ad25c98b9a4884d5cc0edd4e290c4409 (diff)
add gpu impl for shadermaskfilter
adds MulChildAlphaByInput renames MulOutputByInputAlpha --> MulChildByInputAlpha Bug: skia:7500 Change-Id: Ic0615d4d23a887fbee510901ed77a36f98a1b11d Reviewed-on: https://skia-review.googlesource.com/102440 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/shaders')
-rw-r--r--src/shaders/SkImageShader.cpp2
-rw-r--r--src/shaders/SkPerlinNoiseShader.cpp4
-rw-r--r--src/shaders/gradients/SkGradientShaderPriv.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/shaders/SkImageShader.cpp b/src/shaders/SkImageShader.cpp
index 4ca6cd9d8f..4eaeae2d28 100644
--- a/src/shaders/SkImageShader.cpp
+++ b/src/shaders/SkImageShader.cpp
@@ -234,7 +234,7 @@ std::unique_ptr<GrFragmentProcessor> SkImageShader::asFragmentProcessor(
if (isAlphaOnly) {
return inner;
}
- return GrFragmentProcessor::MulOutputByInputAlpha(std::move(inner));
+ return GrFragmentProcessor::MulChildByInputAlpha(std::move(inner));
}
#endif
diff --git a/src/shaders/SkPerlinNoiseShader.cpp b/src/shaders/SkPerlinNoiseShader.cpp
index 48c9c30447..5979a9b4b0 100644
--- a/src/shaders/SkPerlinNoiseShader.cpp
+++ b/src/shaders/SkPerlinNoiseShader.cpp
@@ -1434,7 +1434,7 @@ std::unique_ptr<GrFragmentProcessor> SkPerlinNoiseShaderImpl::asFragmentProcesso
auto inner =
GrConstColorProcessor::Make(GrColor4f::FromGrColor(0x80404040),
GrConstColorProcessor::InputMode::kModulateRGBA);
- return GrFragmentProcessor::MulOutputByInputAlpha(std::move(inner));
+ return GrFragmentProcessor::MulChildByInputAlpha(std::move(inner));
}
// Emit zero.
return GrConstColorProcessor::Make(GrColor4f::TransparentBlack(),
@@ -1456,7 +1456,7 @@ std::unique_ptr<GrFragmentProcessor> SkPerlinNoiseShaderImpl::asFragmentProcesso
std::move(permutationsProxy),
std::move(noiseProxy),
m);
- return GrFragmentProcessor::MulOutputByInputAlpha(std::move(inner));
+ return GrFragmentProcessor::MulChildByInputAlpha(std::move(inner));
}
return nullptr;
}
diff --git a/src/shaders/gradients/SkGradientShaderPriv.h b/src/shaders/gradients/SkGradientShaderPriv.h
index 53411b2d17..d71ba0295d 100644
--- a/src/shaders/gradients/SkGradientShaderPriv.h
+++ b/src/shaders/gradients/SkGradientShaderPriv.h
@@ -280,7 +280,7 @@ protected:
} else {
fp = std::move(gradientFP);
}
- return GrFragmentProcessor::MulOutputByInputAlpha(std::move(fp));
+ return GrFragmentProcessor::MulChildByInputAlpha(std::move(fp));
}
#if GR_TEST_UTILS