From 2d721d33aad192cc8a7a1321504b39bdca2a57ce Mon Sep 17 00:00:00 2001 From: egdaniel Date: Wed, 11 Nov 2015 13:06:05 -0800 Subject: Move all ShaderBuilder files to GLSL BUG=skia: Review URL: https://codereview.chromium.org/1438003003 --- src/effects/SkAlphaThresholdFilter.cpp | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'src/effects/SkAlphaThresholdFilter.cpp') diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp index 495c62f3a4..167489b689 100644 --- a/src/effects/SkAlphaThresholdFilter.cpp +++ b/src/effects/SkAlphaThresholdFilter.cpp @@ -58,7 +58,8 @@ SkImageFilter* SkAlphaThresholdFilter::Create(const SkRegion& region, #include "SkGr.h" #include "gl/GrGLFragmentProcessor.h" -#include "gl/builders/GrGLProgramBuilder.h" +#include "glsl/GrGLSLFragmentShaderBuilder.h" +#include "glsl/GrGLSLProgramBuilder.h" #include "glsl/GrGLSLProgramDataManager.h" class AlphaThresholdEffect : public GrFragmentProcessor { @@ -138,16 +139,14 @@ private: }; void GrGLAlphaThresholdEffect::emitCode(EmitArgs& args) { - fInnerThresholdVar = args.fBuilder->addUniform( - GrGLProgramBuilder::kFragment_Visibility, - kFloat_GrSLType, kDefault_GrSLPrecision, - "inner_threshold"); - fOuterThresholdVar = args.fBuilder->addUniform( - GrGLProgramBuilder::kFragment_Visibility, - kFloat_GrSLType, kDefault_GrSLPrecision, - "outer_threshold"); - - GrGLFragmentBuilder* fsBuilder = args.fBuilder->getFragmentShaderBuilder(); + fInnerThresholdVar = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility, + kFloat_GrSLType, kDefault_GrSLPrecision, + "inner_threshold"); + fOuterThresholdVar = args.fBuilder->addUniform(GrGLSLProgramBuilder::kFragment_Visibility, + kFloat_GrSLType, kDefault_GrSLPrecision, + "outer_threshold"); + + GrGLSLFragmentBuilder* fsBuilder = args.fBuilder->getFragmentShaderBuilder(); SkString coords2D = fsBuilder->ensureFSCoords2D(args.fCoords, 0); SkString maskCoords2D = fsBuilder->ensureFSCoords2D(args.fCoords, 1); @@ -205,7 +204,7 @@ const GrFragmentProcessor* AlphaThresholdEffect::TestCreate(GrProcessorTestData* /////////////////////////////////////////////////////////////////////////////// void AlphaThresholdEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, - GrProcessorKeyBuilder* b) const { + GrProcessorKeyBuilder* b) const { GrGLAlphaThresholdEffect::GenKey(*this, caps, b); } -- cgit v1.2.3