src/gpu/effects/GrBezierEffect.cpp - Issue 611653002: Cleanup of shader building system

Unified Diff: src/gpu/effects/GrBezierEffect.cpp

Issue 611653002: Cleanup of shader building system (Closed) Base URL: https://skia.googlesource.com/skia.git@solo_gp

Patch Set: more cleanup Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: src/gpu/effects/GrBezierEffect.cpp

diff --git a/src/gpu/effects/GrBezierEffect.cpp b/src/gpu/effects/GrBezierEffect.cpp

index fe509b60a4ba6412f374e33d6a6602693de77576..6f33d23989372123a99fe3f293f6cee15142568e 100644

--- a/src/gpu/effects/GrBezierEffect.cpp

+++ b/src/gpu/effects/GrBezierEffect.cpp

@@ -7,7 +7,7 @@

#include "GrBezierEffect.h"

-#include "gl/builders/GrGLFullProgramBuilder.h"

+#include "gl/builders/GrGLSkiaProgramBuilder.h"

#include "gl/GrGLProcessor.h"

#include "gl/GrGLSL.h"

#include "gl/GrGLGeometryProcessor.h"

@@ -17,7 +17,7 @@ class GrGLConicEffect : public GrGLGeometryProcessor {

public:

GrGLConicEffect(const GrBackendProcessorFactory&, const GrProcessor&);

- virtual void emitCode(GrGLFullProgramBuilder* builder,

+ virtual void emitCode(GrGLGeometryProcessorProgramBuilder* builder,

const GrGeometryProcessor& geometryProcessor,

const GrProcessorKey& key,

const char* outputColor,

@@ -42,7 +42,7 @@ GrGLConicEffect::GrGLConicEffect(const GrBackendProcessorFactory& factory,

fEdgeType = ce.getEdgeType();

}

-void GrGLConicEffect::emitCode(GrGLFullProgramBuilder* builder,

+void GrGLConicEffect::emitCode(GrGLGeometryProcessorProgramBuilder* builder,

const GrGeometryProcessor& geometryProcessor,

const GrProcessorKey& key,

const char* outputColor,

@@ -171,7 +171,7 @@ class GrGLQuadEffect : public GrGLGeometryProcessor {

public:

GrGLQuadEffect(const GrBackendProcessorFactory&, const GrProcessor&);

- virtual void emitCode(GrGLFullProgramBuilder* builder,

+ virtual void emitCode(GrGLGeometryProcessorProgramBuilder* builder,

const GrGeometryProcessor& geometryProcessor,

const GrProcessorKey& key,

const char* outputColor,

@@ -196,7 +196,7 @@ GrGLQuadEffect::GrGLQuadEffect(const GrBackendProcessorFactory& factory,

fEdgeType = ce.getEdgeType();

}

-void GrGLQuadEffect::emitCode(GrGLFullProgramBuilder* builder,

+void GrGLQuadEffect::emitCode(GrGLGeometryProcessorProgramBuilder* builder,

const GrGeometryProcessor& geometryProcessor,

const GrProcessorKey& key,

const char* outputColor,

@@ -309,7 +309,7 @@ class GrGLCubicEffect : public GrGLGeometryProcessor {

public:

GrGLCubicEffect(const GrBackendProcessorFactory&, const GrProcessor&);

- virtual void emitCode(GrGLFullProgramBuilder* builder,

+ virtual void emitCode(GrGLGeometryProcessorProgramBuilder* builder,

const GrGeometryProcessor& geometryProcessor,

const GrProcessorKey& key,

const char* outputColor,

@@ -334,7 +334,7 @@ GrGLCubicEffect::GrGLCubicEffect(const GrBackendProcessorFactory& factory,

fEdgeType = ce.getEdgeType();

}

-void GrGLCubicEffect::emitCode(GrGLFullProgramBuilder* builder,

+void GrGLCubicEffect::emitCode(GrGLGeometryProcessorProgramBuilder* builder,

const GrGeometryProcessor& geometryProcessor,

const GrProcessorKey& key,

const char* outputColor,

« src/gpu/GrDrawTarget.cpp ('K') | « src/gpu/GrOvalRenderer.cpp ('k') | src/gpu/effects/GrCustomCoordsTextureEffect.cpp » ('j') | src/gpu/gl/GrGLProgram.h » ('J')