From c17bf32a1bf2f79a8c4a281c2ad312a3cdb610cd Mon Sep 17 00:00:00 2001 From: Chris Dalton Date: Tue, 24 Oct 2017 10:59:03 -0600 Subject: Convert geometry shaders to operate in Skia device space Defers the transformation to normalized window coordinates until after the geometry shader. Merges vertex and a geometry shader builders into a single compilation unit with a common base class. Updates CCPR geometry shaders accordingly. Bug: skia: Change-Id: If93c90e978b1fdc7120febd05cfb05810fd496b5 Reviewed-on: https://skia-review.googlesource.com/62980 Reviewed-by: Greg Daniel Commit-Queue: Chris Dalton --- src/gpu/ccpr/GrCCPRTriangleShader.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/gpu/ccpr/GrCCPRTriangleShader.h') diff --git a/src/gpu/ccpr/GrCCPRTriangleShader.h b/src/gpu/ccpr/GrCCPRTriangleShader.h index efc25219f2..64e54954a2 100644 --- a/src/gpu/ccpr/GrCCPRTriangleShader.h +++ b/src/gpu/ccpr/GrCCPRTriangleShader.h @@ -23,8 +23,7 @@ public: const TexelBufferHandle& pointsBuffer, const char* pointId) const final; - void emitWind(GrGLSLShaderBuilder* s, const char* pts, const char* rtAdjust, - const char* outputWind) const final; + void emitWind(GrGLSLShaderBuilder* s, const char* pts, const char* outputWind) const final; }; /** @@ -64,8 +63,7 @@ class GrCCPRTriangleCornerShader : public GrCCPRTriangleShader { GeometryType getGeometryType() const override { return GeometryType::kCorners; } void emitSetupCode(GrGLSLShaderBuilder*, const char* pts, const char* cornerId, - const char* bloat, const char* wind, const char* rtAdjust, - GeometryVars*) const override; + const char* wind, GeometryVars*) const override; WindHandling onEmitVaryings(GrGLSLVaryingHandler*, SkString* code, const char* position, const char* coverage, const char* wind) override; void onEmitFragmentCode(GrGLSLPPFragmentBuilder* f, const char* outputCoverage) const override; -- cgit v1.2.3