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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/gpu/effects/GrCustomCoordsTextureEffect.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:

Index: src/gpu/effects/GrCustomCoordsTextureEffect.cpp

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

index 7362ba98a63eb249d15297ee03af8a3ee378170e..ffa4c1b444c5de6b664aac749f2936d7ec044fbf 100644

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

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

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

#include "GrCustomCoordsTextureEffect.h"

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

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

#include "gl/GrGLProcessor.h"

#include "gl/GrGLSL.h"

#include "gl/GrGLTexture.h"

@@ -19,7 +19,7 @@ public:

GrGLCustomCoordsTextureEffect(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,

@@ -40,7 +40,7 @@ public:

const GrShaderVar& inTextureCoords = customCoordsTextureEffect.inTextureCoords();

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

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

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

fsBuilder->codeAppendf("\t%s = ", outputColor);

fsBuilder->appendTextureLookupAndModulate(inputColor,

samplers[0],