src/gpu/effects/GrDistanceFieldTextureEffect.cpp - Issue 611653002: Cleanup of shader building system - Code Review

Chromium Code Reviews

chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out

(124)

My Issues | Starred Open | Closed | All

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

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

Patch Set: more cleanup Created 6 years, 3 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

« src/gpu/GrDrawTarget.cpp ('K') | « src/gpu/effects/GrDashingEffect.cpp ('k') | src/gpu/gl/GrGLGeometryProcessor.h » ('j') | src/gpu/gl/GrGLProgram.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: src/gpu/effects/GrDistanceFieldTextureEffect.cpp

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

index d5d334805c105eb56012bf8729353df9b1b99655..63e38b5b330fb4147fd813c26eb9bbb94349962a 100755

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

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

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

*/

#include "GrDistanceFieldTextureEffect.h"

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

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

#include "gl/GrGLProcessor.h"

#include "gl/GrGLSL.h"

#include "gl/GrGLTexture.h"

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

#endif

{}

- virtual void emitCode(GrGLFullProgramBuilder* builder,

+ virtual void emitCode(GrGLGeometryProcessorProgramBuilder* builder,

const GrGeometryProcessor& geometryProcessor,

const GrProcessorKey& key,

const char* outputColor,

@@ -269,7 +269,7 @@ public:

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

, fTextColor(GrColor_ILLEGAL) {}

- virtual void emitCode(GrGLFullProgramBuilder* builder,

+ virtual void emitCode(GrGLGeometryProcessorProgramBuilder* builder,

const GrGeometryProcessor& geometryProcessor,

const GrProcessorKey& key,

const char* outputColor,

« src/gpu/GrDrawTarget.cpp ('K') | « src/gpu/effects/GrDashingEffect.cpp ('k') | src/gpu/gl/GrGLGeometryProcessor.h » ('j') | src/gpu/gl/GrGLProgram.h » ('J')

Powered by Google App Engine

This is Rietveld 408576698