src/gpu/effects/GrDistanceFieldTextureEffect.cpp - Issue 675193002: Revert of Added varying struct

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

Issue 675193002: Revert of Added varying struct (Closed) Base URL: https://skia.googlesource.com/skia.git@gp_emit_struct

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 e90ebfbf752d87262a75f2d92ff7740a88162c9e..ca38e849eb923db264f4450aac1b0e7da3dfc08c 100755

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

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

@@ -49,11 +49,14 @@

SkAssertResult(fsBuilder->enableFeature(

GrGLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));

- GrGLVertToFrag v(kVec2f_GrSLType);

- args.fPB->addVarying("TextureCoords", &v);

+ SkString fsCoordName;

+ const char* vsCoordName;

+ const char* fsCoordNamePtr;

+ args.fPB->addVarying(kVec2f_GrSLType, "textureCoords", &vsCoordName, &fsCoordNamePtr);

+ fsCoordName = fsCoordNamePtr;

GrGLVertexBuilder* vsBuilder = args.fPB->getVertexShaderBuilder();

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

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

const char* textureSizeUniName = NULL;

fTextureSizeUni = args.fPB->addUniform(GrGLProgramBuilder::kFragment_Visibility,

@@ -62,7 +65,7 @@

fsBuilder->codeAppend("\tvec4 texColor = ");

fsBuilder->appendTextureLookup(args.fSamplers[0],

- v.fsIn(),

+ fsCoordName.c_str(),

kVec2f_GrSLType);

fsBuilder->codeAppend(";\n");

fsBuilder->codeAppend("\tfloat distance = "

@@ -72,7 +75,7 @@

// we adjust for the effect of the transformation on the distance by using

// the length of the gradient of the texture coordinates. We use st coordinates

// to ensure we're mapping 1:1 from texel space to pixel space.

- fsBuilder->codeAppendf("\tvec2 uv = %s;\n", v.fsIn());

+ fsBuilder->codeAppendf("\tvec2 uv = %s;\n", fsCoordName.c_str());

fsBuilder->codeAppendf("\tvec2 st = uv*%s;\n", textureSizeUniName);

fsBuilder->codeAppend("\tfloat afwidth;\n");

if (dfTexEffect.getFlags() & kSimilarity_DistanceFieldEffectFlag) {

@@ -261,11 +264,14 @@

SkAssertResult(fsBuilder->enableFeature(

GrGLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));

- GrGLVertToFrag v(kVec2f_GrSLType);

- args.fPB->addVarying("TextureCoords", &v);

+ SkString fsCoordName;

+ const char* vsCoordName;

+ const char* fsCoordNamePtr;

+ args.fPB->addVarying(kVec2f_GrSLType, "textureCoords", &vsCoordName, &fsCoordNamePtr);

+ fsCoordName = fsCoordNamePtr;

GrGLVertexBuilder* vsBuilder = args.fPB->getVertexShaderBuilder();

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

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

const char* textureSizeUniName = NULL;

fTextureSizeUni = args.fPB->addUniform(GrGLProgramBuilder::kFragment_Visibility,

@@ -274,7 +280,7 @@

fsBuilder->codeAppend("vec4 texColor = ");

fsBuilder->appendTextureLookup(args.fSamplers[0],

- v.fsIn(),

+ fsCoordName.c_str(),

kVec2f_GrSLType);

fsBuilder->codeAppend(";");

fsBuilder->codeAppend("float distance = "

@@ -283,7 +289,7 @@

// we adjust for the effect of the transformation on the distance by using

// the length of the gradient of the texture coordinates. We use st coordinates

// to ensure we're mapping 1:1 from texel space to pixel space.

- fsBuilder->codeAppendf("vec2 uv = %s;", v.fsIn());

+ fsBuilder->codeAppendf("vec2 uv = %s;", fsCoordName.c_str());

fsBuilder->codeAppendf("vec2 st = uv*%s;", textureSizeUniName);

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

if (dfTexEffect.getFlags() & kSimilarity_DistanceFieldEffectFlag) {

@@ -415,11 +421,14 @@

args.fGP.cast<GrDistanceFieldLCDTextureEffect>();

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

- GrGLVertToFrag v(kVec2f_GrSLType);

- args.fPB->addVarying("TextureCoords", &v);

+ SkString fsCoordName;

+ const char* vsCoordName;

+ const char* fsCoordNamePtr;

+ args.fPB->addVarying(kVec2f_GrSLType, "textureCoords", &vsCoordName, &fsCoordNamePtr);

+ fsCoordName = fsCoordNamePtr;

GrGLVertexBuilder* vsBuilder = args.fPB->getVertexShaderBuilder();

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

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

const char* textureSizeUniName = NULL;

// width, height, 1/(3*width)

@@ -433,7 +442,7 @@

GrGLFragmentShaderBuilder::kStandardDerivatives_GLSLFeature));

// create LCD offset adjusted by inverse of transform

- fsBuilder->codeAppendf("\tvec2 uv = %s;\n", v.fsIn());

+ fsBuilder->codeAppendf("\tvec2 uv = %s;\n", fsCoordName.c_str());

fsBuilder->codeAppendf("\tvec2 st = uv*%s.xy;\n", textureSizeUniName);

bool isUniformScale = !!(dfTexEffect.getFlags() & kUniformScale_DistanceFieldEffectMask);

if (isUniformScale) {

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