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: name changes Created 6 years, 2 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..1f6c17d22529385432e3e88d3f729f4e8c96ea33 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/GrGLProgramBuilder.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(GrGLGPBuilder* 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(GrGLGPBuilder* builder,

const GrGeometryProcessor& geometryProcessor,

const GrProcessorKey& key,

const char* outputColor,

@@ -58,7 +58,7 @@ void GrGLConicEffect::emitCode(GrGLFullProgramBuilder* builder,

GrGLVertexShaderBuilder* vsBuilder = builder->getVertexShaderBuilder();

vsBuilder->codeAppendf("%s = %s;", vsName, inConicCoeffs.c_str());

- GrGLProcessorFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder();

+ GrGLGPFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder();

fsBuilder->codeAppend("float edgeAlpha;");

switch (fEdgeType) {

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

public:

GrGLQuadEffect(const GrBackendProcessorFactory&, const GrProcessor&);

- virtual void emitCode(GrGLFullProgramBuilder* builder,

+ virtual void emitCode(GrGLGPBuilder* 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(GrGLGPBuilder* builder,

const GrGeometryProcessor& geometryProcessor,

const GrProcessorKey& key,

const char* outputColor,

@@ -210,7 +210,7 @@ void GrGLQuadEffect::emitCode(GrGLFullProgramBuilder* builder,

const GrShaderVar& inHairQuadEdge = geometryProcessor.cast<GrQuadEffect>().inHairQuadEdge();

vsBuilder->codeAppendf("%s = %s;", vsName, inHairQuadEdge.c_str());

- GrGLProcessorFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder();

+ GrGLGPFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder();

fsBuilder->codeAppendf("float edgeAlpha;");

switch (fEdgeType) {

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

public:

GrGLCubicEffect(const GrBackendProcessorFactory&, const GrProcessor&);

- virtual void emitCode(GrGLFullProgramBuilder* builder,

+ virtual void emitCode(GrGLGPBuilder* 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(GrGLGPBuilder* builder,

const GrGeometryProcessor& geometryProcessor,

const GrProcessorKey& key,

const char* outputColor,

@@ -350,7 +350,7 @@ void GrGLCubicEffect::emitCode(GrGLFullProgramBuilder* builder,

const GrShaderVar& inCubicCoeffs = geometryProcessor.cast<GrCubicEffect>().inCubicCoeffs();

vsBuilder->codeAppendf("%s = %s;", vsName, inCubicCoeffs.c_str());

- GrGLProcessorFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder();

+ GrGLGPFragmentShaderBuilder* fsBuilder = builder->getFragmentShaderBuilder();

GrGLShaderVar edgeAlpha("edgeAlpha", kFloat_GrSLType, 0, GrGLShaderVar::kHigh_Precision);

GrGLShaderVar dklmdx("dklmdx", kVec3f_GrSLType, 0, GrGLShaderVar::kHigh_Precision);

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