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

Unified Diff: src/gpu/GrOvalRenderer.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/GrOvalRenderer.cpp

diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp

index 7a84f80805d9bf5cc6ab8c1b3d205f4525634343..2f3671a4abca01ef685f6fb1049805a2f1d4e041 100644

--- a/src/gpu/GrOvalRenderer.cpp

+++ b/src/gpu/GrOvalRenderer.cpp

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

#include "GrOvalRenderer.h"

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

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

#include "gl/GrGLProcessor.h"

#include "gl/GrGLSL.h"

#include "gl/GrGLGeometryProcessor.h"

@@ -92,7 +92,7 @@ public:

GLProcessor(const GrBackendProcessorFactory& factory, const GrProcessor&)

: INHERITED (factory) {}

- virtual void emitCode(GrGLFullProgramBuilder* builder,

+ virtual void emitCode(GrGLGPBuilder* builder,

const GrGeometryProcessor& geometryProcessor,

const GrProcessorKey& key,

const char* outputColor,

@@ -106,7 +106,7 @@ public:

GrGLVertexShaderBuilder* vsBuilder = builder->getVertexShaderBuilder();;

vsBuilder->codeAppendf("\t%s = %s;\n", vsName, circleEffect.inCircleEdge().c_str());

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

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

fsBuilder->codeAppendf("\tfloat d = length(%s.xy);\n", fsName);

fsBuilder->codeAppendf("\tfloat edgeAlpha = clamp(%s.z - d, 0.0, 1.0);\n", fsName);

if (circleEffect.isStroked()) {

@@ -210,7 +210,7 @@ public:

GLProcessor(const GrBackendProcessorFactory& factory, const GrProcessor&)

: INHERITED (factory) {}

- virtual void emitCode(GrGLFullProgramBuilder* builder,

+ virtual void emitCode(GrGLGPBuilder* builder,

const GrGeometryProcessor& geometryProcessor,

const GrProcessorKey& key,

const char* outputColor,

@@ -232,7 +232,7 @@ public:

vsBuilder->codeAppendf("%s = %s;", vsRadiiName, ellipseEffect.inEllipseRadii().c_str());

// for outer curve

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

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

fsBuilder->codeAppendf("\tvec2 scaledOffset = %s*%s.xy;\n", fsOffsetName, fsRadiiName);

fsBuilder->codeAppend("\tfloat test = dot(scaledOffset, scaledOffset) - 1.0;\n");

fsBuilder->codeAppendf("\tvec2 grad = 2.0*scaledOffset*%s.xy;\n", fsRadiiName);

@@ -359,7 +359,7 @@ public:

GLProcessor(const GrBackendProcessorFactory& factory, const GrProcessor&)

: INHERITED (factory) {}

- virtual void emitCode(GrGLFullProgramBuilder* builder,

+ virtual void emitCode(GrGLGPBuilder* builder,

const GrGeometryProcessor& geometryProcessor,

const GrProcessorKey& key,

const char* outputColor,

@@ -382,7 +382,7 @@ public:

vsBuilder->codeAppendf("\t%s = %s;\n", vsOffsetName1,

ellipseEffect.inEllipseOffsets1().c_str());

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

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

SkAssertResult(fsBuilder->enableFeature(

GrGLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));

// for outer curve

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