src/effects/SkPerlinNoiseShader.cpp - Issue 1862373003: Rename EmitArgs::fSamplers to fTexSamplers

Unified Diff: src/effects/SkPerlinNoiseShader.cpp

Issue 1862373003: Rename EmitArgs::fSamplers to fTexSamplers (Closed) Base URL: https://skia.googlesource.com/skia.git@upload3_infer

Patch Set: rebase Created 4 years, 8 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/effects/SkPerlinNoiseShader.cpp

diff --git a/src/effects/SkPerlinNoiseShader.cpp b/src/effects/SkPerlinNoiseShader.cpp

index c8b04c997521e7f91772db542801ac28264c4fa0..63916d3ca74112045529ea2f71463af46038f567 100644

--- a/src/effects/SkPerlinNoiseShader.cpp

+++ b/src/effects/SkPerlinNoiseShader.cpp

@@ -683,7 +683,7 @@ void GrGLPerlinNoise::emitCode(EmitArgs& args) {

xCoords.appendf("vec2(%s.x, 0.5)", floorVal);

noiseCode.appendf("\n\tvec2 %s;\n\t%s.x = ", latticeIdx, latticeIdx);

- fragBuilder->appendTextureLookup(&noiseCode, args.fSamplers[0], xCoords.c_str(),

+ fragBuilder->appendTextureLookup(&noiseCode, args.fTexSamplers[0], xCoords.c_str(),

kVec2f_GrSLType);

noiseCode.append(".r;");

}

@@ -694,7 +694,7 @@ void GrGLPerlinNoise::emitCode(EmitArgs& args) {

xCoords.appendf("vec2(%s.z, 0.5)", floorVal);

noiseCode.appendf("\n\t%s.y = ", latticeIdx);

- fragBuilder->appendTextureLookup(&noiseCode, args.fSamplers[0], xCoords.c_str(),

+ fragBuilder->appendTextureLookup(&noiseCode, args.fTexSamplers[0], xCoords.c_str(),

kVec2f_GrSLType);

noiseCode.append(".r;");

}

@@ -719,7 +719,7 @@ void GrGLPerlinNoise::emitCode(EmitArgs& args) {

SkString latticeCoords("");

latticeCoords.appendf("vec2(%s.x, %s)", bcoords, chanCoord);

noiseCode.appendf("\n\tvec4 %s = ", lattice);

- fragBuilder->appendTextureLookup(&noiseCode, args.fSamplers[1], latticeCoords.c_str(),

+ fragBuilder->appendTextureLookup(&noiseCode, args.fTexSamplers[1], latticeCoords.c_str(),

kVec2f_GrSLType);

noiseCode.appendf(".bgra;\n\t%s.x = ", uv);

noiseCode.appendf(dotLattice, lattice, lattice, inc8bit, fractVal);

@@ -731,7 +731,7 @@ void GrGLPerlinNoise::emitCode(EmitArgs& args) {

SkString latticeCoords("");

latticeCoords.appendf("vec2(%s.y, %s)", bcoords, chanCoord);

noiseCode.append("\n\tlattice = ");

- fragBuilder->appendTextureLookup(&noiseCode, args.fSamplers[1], latticeCoords.c_str(),

+ fragBuilder->appendTextureLookup(&noiseCode, args.fTexSamplers[1], latticeCoords.c_str(),

kVec2f_GrSLType);

noiseCode.appendf(".bgra;\n\t%s.y = ", uv);

noiseCode.appendf(dotLattice, lattice, lattice, inc8bit, fractVal);

@@ -747,7 +747,7 @@ void GrGLPerlinNoise::emitCode(EmitArgs& args) {

SkString latticeCoords("");

latticeCoords.appendf("vec2(%s.w, %s)", bcoords, chanCoord);

noiseCode.append("\n\tlattice = ");

- fragBuilder->appendTextureLookup(&noiseCode, args.fSamplers[1], latticeCoords.c_str(),

+ fragBuilder->appendTextureLookup(&noiseCode, args.fTexSamplers[1], latticeCoords.c_str(),

kVec2f_GrSLType);

noiseCode.appendf(".bgra;\n\t%s.y = ", uv);

noiseCode.appendf(dotLattice, lattice, lattice, inc8bit, fractVal);

@@ -759,7 +759,7 @@ void GrGLPerlinNoise::emitCode(EmitArgs& args) {

SkString latticeCoords("");

latticeCoords.appendf("vec2(%s.z, %s)", bcoords, chanCoord);

noiseCode.append("\n\tlattice = ");

- fragBuilder->appendTextureLookup(&noiseCode, args.fSamplers[1], latticeCoords.c_str(),

+ fragBuilder->appendTextureLookup(&noiseCode, args.fTexSamplers[1], latticeCoords.c_str(),

kVec2f_GrSLType);

noiseCode.appendf(".bgra;\n\t%s.x = ", uv);

noiseCode.appendf(dotLattice, lattice, lattice, inc8bit, fractVal);

« no previous file with comments | « src/effects/SkMorphologyImageFilter.cpp ('k') | src/effects/SkTableColorFilter.cpp » ('j') | no next file with comments »