src/gpu/gl/builders/GrGLProgramBuilder.cpp - Issue 1885863004: Refactor how we store and use samplers in Ganesh

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.cpp

Issue 1885863004: Refactor how we store and use samplers in Ganesh (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Remove unneeded assert Created 4 years, 8 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.cpp

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

index fbe1722ded9b535f5d7de6255908e3e2ac0587b5..c6422caa86f1410adca213440d8be6cc4b134be1 100644

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

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

@@ -233,9 +233,9 @@ GrGLProgram* GrGLProgramBuilder::createProgram(GrGLuint programID) {

fUniformHandles,

programID,

fUniformHandler.fUniforms,

+ fUniformHandler.fSamplers,

fVaryingHandler.fPathProcVaryingInfos,

fGeometryProcessor,

fXferProcessor,

- fFragmentProcessors,

- &fSamplerUniforms);

+ fFragmentProcessors);

}

« no previous file with comments | « src/gpu/gl/GrGLUniformHandler.cpp ('k') | src/gpu/glsl/GrGLSLFragmentProcessor.h » ('j') | no next file with comments »