src/gpu/effects/GrDashingEffect.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/GrDashingEffect.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

Download patch

Index: src/gpu/effects/GrDashingEffect.cpp

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

index 704a6ac3e67b39d0cc4644fa54a7d46cd86b3b6a..e741b64cc0129fce275ab85a7567986ac611b8f9 100644

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

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

@@ -10,7 +10,7 @@

#include "../GrAARectRenderer.h"

#include "GrGeometryProcessor.h"

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

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

#include "gl/GrGLProcessor.h"

#include "gl/GrGLGeometryProcessor.h"

#include "gl/GrGLSL.h"

@@ -482,7 +482,7 @@ class GLDashingCircleEffect : public GrGLGeometryProcessor {

public:

GLDashingCircleEffect(const GrBackendProcessorFactory&, const GrProcessor&);

- virtual void emitCode(GrGLFullProgramBuilder* builder,

+ virtual void emitCode(GrGLGeometryProcessorProgramBuilder* builder,

const GrGeometryProcessor& geometryProcessor,

const GrProcessorKey& key,

const char* outputColor,

@@ -510,7 +510,7 @@ GLDashingCircleEffect::GLDashingCircleEffect(const GrBackendProcessorFactory& fa

fPrevIntervalLength = SK_ScalarMax;

}

-void GLDashingCircleEffect::emitCode(GrGLFullProgramBuilder* builder,

+void GLDashingCircleEffect::emitCode(GrGLGeometryProcessorProgramBuilder* builder,

const GrGeometryProcessor& geometryProcessor,

const GrProcessorKey& key,

const char* outputColor,

@@ -693,7 +693,7 @@ class GLDashingLineEffect : public GrGLGeometryProcessor {

public:

GLDashingLineEffect(const GrBackendProcessorFactory&, const GrProcessor&);

- virtual void emitCode(GrGLFullProgramBuilder* builder,

+ virtual void emitCode(GrGLGeometryProcessorProgramBuilder* builder,

const GrGeometryProcessor& geometryProcessor,

const GrProcessorKey& key,

const char* outputColor,

@@ -720,7 +720,7 @@ GLDashingLineEffect::GLDashingLineEffect(const GrBackendProcessorFactory& factor

fPrevIntervalLength = SK_ScalarMax;

}

-void GLDashingLineEffect::emitCode(GrGLFullProgramBuilder* builder,

+void GLDashingLineEffect::emitCode(GrGLGeometryProcessorProgramBuilder* builder,

const GrGeometryProcessor& geometryProcessor,

const GrProcessorKey& key,

const char* outputColor,

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