src/gpu/effects/GrDistanceFieldTextureEffect.cpp - Issue 635533005: Revert of Cleanup of shader building system

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

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

Patch Set: 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/GrDistanceFieldTextureEffect.cpp

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

index c8ed5c9edadf1a72b804d45ecd52c31fa978b9e8..265f112c2bb4a44d38491597ca12c5f3c0b8d95c 100755

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

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

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

#include "GrDistanceFieldTextureEffect.h"

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

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

#include "gl/GrGLProcessor.h"

#include "gl/GrGLSL.h"

#include "gl/GrGLTexture.h"

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

#endif

{}

- virtual void emitCode(GrGLGPBuilder* builder,

+ virtual void emitCode(GrGLFullProgramBuilder* builder,

const GrGeometryProcessor& geometryProcessor,

const GrProcessorKey& key,

const char* outputColor,

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

geometryProcessor.cast<GrDistanceFieldTextureEffect>();

SkASSERT(1 == dfTexEffect.getVertexAttribs().count());

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

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

SkAssertResult(fsBuilder->enableFeature(

GrGLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));

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

builder->addVarying(kVec2f_GrSLType, "textureCoords", &vsCoordName, &fsCoordNamePtr);

fsCoordName = fsCoordNamePtr;

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

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

vsBuilder->codeAppendf("\t%s = %s;\n", vsCoordName, dfTexEffect.inTextureCoords().c_str());

const char* textureSizeUniName = NULL;

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

: INHERITED(factory)

, fTextureSize(SkISize::Make(-1, -1)) {}

- virtual void emitCode(GrGLGPBuilder* builder,

+ virtual void emitCode(GrGLFullProgramBuilder* builder,

const GrGeometryProcessor& effect,

const GrProcessorKey& key,

const char* outputColor,

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

effect.cast<GrDistanceFieldNoGammaTextureEffect>();

SkASSERT(1 == dfTexEffect.getVertexAttribs().count());

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

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

SkAssertResult(fsBuilder->enableFeature(

GrGLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));

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

builder->addVarying(kVec2f_GrSLType, "textureCoords", &vsCoordName, &fsCoordNamePtr);

fsCoordName = fsCoordNamePtr;

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

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

vsBuilder->codeAppendf("%s = %s;", vsCoordName, dfTexEffect.inTextureCoords().c_str());

const char* textureSizeUniName = NULL;

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

, fTextureSize(SkISize::Make(-1,-1))

, fTextColor(GrColor_ILLEGAL) {}

- virtual void emitCode(GrGLGPBuilder* builder,

+ virtual void emitCode(GrGLFullProgramBuilder* builder,

const GrGeometryProcessor& geometryProcessor,

const GrProcessorKey& key,

const char* outputColor,

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

builder->addVarying(kVec2f_GrSLType, "textureCoords", &vsCoordName, &fsCoordNamePtr);

fsCoordName = fsCoordNamePtr;

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

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

vsBuilder->codeAppendf("\t%s = %s;\n", vsCoordName, dfTexEffect.inTextureCoords().c_str());

const char* textureSizeUniName = NULL;

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

kVec3f_GrSLType, "TextureSize",

&textureSizeUniName);

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

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

SkAssertResult(fsBuilder->enableFeature(

GrGLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));

« no previous file with comments | « src/gpu/effects/GrDashingEffect.cpp ('k') | src/gpu/gl/GrGLGeometryProcessor.h » ('j') | no next file with comments »