src/gpu/gl/builders/GrGLFragmentShaderBuilder.h - Issue 929503002: Multi-string shaders

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/GrGLFragmentShaderBuilder.h

Issue 929503002: Multi-string shaders (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: windows warning Created 5 years, 10 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/GrGLFragmentShaderBuilder.h

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

index 903c5e1d7be9f7ee68c15b12aea1267ca5d4b2a0..f294257a1be73be61fe1d6f43edee71d3ab67b90 100644

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

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

@@ -101,7 +101,7 @@ private:

void enableSecondaryOutput();

const char* getPrimaryColorOutputName() const;

const char* getSecondaryColorOutputName() const;

- bool compileAndAttachShaders(GrGLuint programId, SkTDArray<GrGLuint>* shaderIds) const;

+ bool compileAndAttachShaders(GrGLuint programId, SkTDArray<GrGLuint>* shaderIds);

void bindFragmentShaderLocations(GrGLuint programID);

// As GLProcessors emit code, there are some conditions we need to verify. We use the below