src/gpu/glsl/GrGLSLFragmentProcessor.cpp - Issue 1490283004: Create GLSLUniformHandler class for gpu backend

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/glsl/GrGLSLFragmentProcessor.cpp

Issue 1490283004: Create GLSLUniformHandler class for gpu backend (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: clean up public api of uniformhandler Created 5 years 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/glsl/GrGLSLFragmentProcessor.cpp

diff --git a/src/gpu/glsl/GrGLSLFragmentProcessor.cpp b/src/gpu/glsl/GrGLSLFragmentProcessor.cpp

index a0019669f2100740bd3048b7e92aeb0ca5f55414..649bd99deab6ee36396636334afcf6d4b2d6d6dd 100644

--- a/src/gpu/glsl/GrGLSLFragmentProcessor.cpp

+++ b/src/gpu/glsl/GrGLSLFragmentProcessor.cpp

@@ -9,7 +9,7 @@

#include "GrFragmentProcessor.h"

#include "GrProcessor.h"

#include "glsl/GrGLSLFragmentShaderBuilder.h"

-#include "glsl/GrGLSLProgramBuilder.h"

+#include "glsl/GrGLSLUniformHandler.h"

void GrGLSLFragmentProcessor::setData(const GrGLSLProgramDataManager& pdman,

const GrFragmentProcessor& processor) {

@@ -93,8 +93,8 @@ void GrGLSLFragmentProcessor::internalEmitChild(int childIndex, const char* inpu

fragBuilder->codeAppend("{\n");

fragBuilder->codeAppendf("// Child Index %d (mangle: %s): %s\n", childIndex,

fragBuilder->getMangleString().c_str(), childProc.name());

- EmitArgs childArgs(args.fBuilder,

- fragBuilder,

+ EmitArgs childArgs(fragBuilder,

+ args.fUniformHandler,

args.fGLSLCaps,

childProc,

outputColor,

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