From 7dc4bd06fca73a97dcf3ad4a7425597160f1edfc Mon Sep 17 00:00:00 2001 From: egdaniel Date: Thu, 29 Oct 2015 07:57:01 -0700 Subject: Remove GrGLProcessor and create GrGLSLTextureSampler class. Part ??? of separating glsl and gl BUG=skia: Review URL: https://codereview.chromium.org/1425013003 --- src/gpu/gl/builders/GrGLFragmentShaderBuilder.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/gpu/gl/builders/GrGLFragmentShaderBuilder.h') diff --git a/src/gpu/gl/builders/GrGLFragmentShaderBuilder.h b/src/gpu/gl/builders/GrGLFragmentShaderBuilder.h index 4f17b68ae6..ed92703a01 100644 --- a/src/gpu/gl/builders/GrGLFragmentShaderBuilder.h +++ b/src/gpu/gl/builders/GrGLFragmentShaderBuilder.h @@ -10,6 +10,8 @@ #include "GrGLShaderBuilder.h" +#include "glsl/GrGLSLProcessorTypes.h" + class GrGLVarying; /* @@ -42,8 +44,7 @@ public: * the fragment shader. If the coordinates at index are 3-dimensional, it immediately emits a * perspective divide into the fragment shader (xy / z) to convert them to 2D. */ - virtual SkString ensureFSCoords2D(const GrGLProcessor::TransformedCoordsArray& coords, - int index) = 0; + virtual SkString ensureFSCoords2D(const GrGLSLTransformedCoordsArray& coords, int index) = 0; /** Returns a variable name that represents the position of the fragment in the FS. The position @@ -127,7 +128,7 @@ public: // true public interface, defined explicitly in the abstract interfaces above bool enableFeature(GLSLFeature) override; - virtual SkString ensureFSCoords2D(const GrGLProcessor::TransformedCoordsArray& coords, + virtual SkString ensureFSCoords2D(const GrGLSLTransformedCoordsArray& coords, int index) override; const char* fragmentPosition() override; const char* dstColor() override; -- cgit v1.2.3