src/gpu/gl/builders/GrGLProgramBuilder.h - Issue 1425013003: Remove GrGLProcessor and create GrGLSLTextureSampler class.

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 1425013003: Remove GrGLProcessor and create GrGLSLTextureSampler class. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: remove grglprocessor from gyp Created 5 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/gl/builders/GrGLProgramBuilder.h

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

index 7690b39a8bb2e48c18a43dc98a0315d880995a3f..474544060bbb8f9312a66b58e3962a12085b0f7c 100644

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

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

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

#include "GrGLGeometryShaderBuilder.h"

#include "GrGLVertexShaderBuilder.h"

#include "glsl/GrGLSLProgramDataManager.h"

+#include "glsl/GrGLSLTextureSampler.h"

#include "../GrGLPrimitiveProcessor.h"

#include "../GrGLXferProcessor.h"

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

@@ -330,7 +331,7 @@ protected:

void verify(const GrFragmentProcessor&);

template <class Proc>

void emitSamplers(const GrProcessor&,

- GrGLProcessor::TextureSamplerArray* outSamplers,

+ GrGLSLTextureSampler::TextureSamplerArray* outSamplers,

GrGLInstalledProc<Proc>*);

GrGLProgram* finalize();