src/gpu/gl/builders/GrGLProgramBuilder.h - Issue 1440073002: Move XferProcessors to glsl

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/gl/builders/GrGLProgramBuilder.h

Issue 1440073002: Move XferProcessors to glsl (Closed) Base URL: https://skia.googlesource.com/skia.git@fragProcs

Patch Set: Created 5 years, 1 month 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/gl/builders/GrGLProgramBuilder.h

diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.h b/src/gpu/gl/builders/GrGLProgramBuilder.h

index cb49c348a49cc221d7667e7b5e580da837a6c8a3..02fa88688b3f0657b058a35f672adbcc97f09184 100644

--- a/src/gpu/gl/builders/GrGLProgramBuilder.h

+++ b/src/gpu/gl/builders/GrGLProgramBuilder.h

@@ -8,13 +8,13 @@

#ifndef GrGLProgramBuilder_DEFINED

#define GrGLProgramBuilder_DEFINED

+#include "GrPipeline.h"

+#include "gl/GrGLPrimitiveProcessor.h"

#include "gl/GrGLProgramDataManager.h"

#include "glsl/GrGLSLProgramBuilder.h"

#include "glsl/GrGLSLProgramDataManager.h"

#include "glsl/GrGLSLTextureSampler.h"

-#include "../GrGLPrimitiveProcessor.h"

-#include "../GrGLXferProcessor.h"

-#include "../../GrPipeline.h"

+#include "glsl/GrGLSLXferProcessor.h"

class GrFragmentProcessor;

class GrGLContextInfo;

@@ -31,7 +31,7 @@ struct GrGLInstalledProc {

};

typedef GrGLInstalledProc<GrGLPrimitiveProcessor> GrGLInstalledGeoProc;

-typedef GrGLInstalledProc<GrGLXferProcessor> GrGLInstalledXferProc;

+typedef GrGLInstalledProc<GrGLSLXferProcessor> GrGLInstalledXferProc;

typedef GrGLInstalledProc<GrGLSLFragmentProcessor> GrGLInstalledFragProc;

struct GrGLInstalledFragProcs : public SkRefCnt {

« no previous file with comments | « src/gpu/gl/GrGLXferProcessor.cpp ('k') | src/gpu/gl/builders/GrGLProgramBuilder.cpp » ('j') | no next file with comments »