diff options
Diffstat (limited to 'src/gpu/effects/GrSimpleTextureEffect.fp')
-rw-r--r-- | src/gpu/effects/GrSimpleTextureEffect.fp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/gpu/effects/GrSimpleTextureEffect.fp b/src/gpu/effects/GrSimpleTextureEffect.fp index 456448a6ea..9e9685f626 100644 --- a/src/gpu/effects/GrSimpleTextureEffect.fp +++ b/src/gpu/effects/GrSimpleTextureEffect.fp @@ -6,7 +6,6 @@ */ in uniform sampler2D image; -in uniform colorSpaceXform colorXform; in half4x4 matrix; @constructorParams { @@ -23,29 +22,26 @@ in half4x4 matrix; @make { static std::unique_ptr<GrFragmentProcessor> Make(sk_sp<GrTextureProxy> proxy, - sk_sp<GrColorSpaceXform> colorSpaceXform, const SkMatrix& matrix) { return std::unique_ptr<GrFragmentProcessor>( - new GrSimpleTextureEffect(std::move(proxy), std::move(colorSpaceXform), matrix, + new GrSimpleTextureEffect(std::move(proxy), matrix, GrSamplerState(GrSamplerState::WrapMode::kClamp, GrSamplerState::Filter::kNearest))); } /* clamp mode */ static std::unique_ptr<GrFragmentProcessor> Make(sk_sp<GrTextureProxy> proxy, - sk_sp<GrColorSpaceXform> colorSpaceXform, const SkMatrix& matrix, GrSamplerState::Filter filter) { return std::unique_ptr<GrFragmentProcessor>( - new GrSimpleTextureEffect(std::move(proxy), std::move(colorSpaceXform), matrix, + new GrSimpleTextureEffect(std::move(proxy), matrix, GrSamplerState(GrSamplerState::WrapMode::kClamp, filter))); } static std::unique_ptr<GrFragmentProcessor> Make(sk_sp<GrTextureProxy> proxy, - sk_sp<GrColorSpaceXform> colorSpaceXform, const SkMatrix& matrix, const GrSamplerState& p) { return std::unique_ptr<GrFragmentProcessor>( - new GrSimpleTextureEffect(std::move(proxy), std::move(colorSpaceXform), matrix, p)); + new GrSimpleTextureEffect(std::move(proxy), matrix, p)); } } @@ -56,7 +52,7 @@ in half4x4 matrix; } void main() { - sk_OutColor = sk_InColor * texture(image, sk_TransformedCoords2D[0], colorXform); + sk_OutColor = sk_InColor * texture(image, sk_TransformedCoords2D[0]); } @test(testData) { @@ -69,7 +65,5 @@ void main() { : GrSamplerState::Filter::kNearest); const SkMatrix& matrix = GrTest::TestMatrix(testData->fRandom); - sk_sp<GrColorSpaceXform> colorSpaceXform = GrTest::TestColorXform(testData->fRandom); - return GrSimpleTextureEffect::Make(testData->textureProxy(texIdx), std::move(colorSpaceXform), - matrix); + return GrSimpleTextureEffect::Make(testData->textureProxy(texIdx), matrix); } |