From e782f8472f61a5a553c57fef788ad4405844887b Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Tue, 31 Jul 2018 13:53:11 -0400 Subject: Remove GrResourceIOProcessor. Fold its functionality into GrPrimitiveProcessor and GrFragmentProcessor. Make each have its own TextureSampler nested class. Currently the only difference is that fragment processors lose the ability to inject their samplers into the vertex shader. However, this facilitates refactoring GrPrimitiveProcessor's TextureSampler class such that the textures are specified separately from the TextureSampler. Bug: skia: Change-Id: I1e590187e7a6ae79ee3147155d397fcdcf5e4619 Reviewed-on: https://skia-review.googlesource.com/142814 Commit-Queue: Brian Salomon Reviewed-by: Robert Phillips --- tests/LazyProxyTest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/LazyProxyTest.cpp b/tests/LazyProxyTest.cpp index 4a82d10760..3881251f6c 100644 --- a/tests/LazyProxyTest.cpp +++ b/tests/LazyProxyTest.cpp @@ -137,7 +137,7 @@ public: kBottomLeft_GrSurfaceOrigin, kAlpha_half_GrPixelConfig, *proxyProvider->caps()); fAccess.reset(fLazyProxy, GrSamplerState::Filter::kNearest, - GrSamplerState::WrapMode::kClamp, kFragment_GrShaderFlag); + GrSamplerState::WrapMode::kClamp); this->setTextureSamplerCnt(1); } -- cgit v1.2.3