src/gpu/gl/builders/GrGLLegacyNvprProgramBuilder.cpp - Issue 739673002: Create GrOptDrawState before recording draw in GrInOrderDrawBuffer

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

Issue 739673002: Create GrOptDrawState before recording draw in GrInOrderDrawBuffer (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: more Created 6 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:

View side-by-side diff with in-line comments

Download patch

« src/gpu/gl/GrGLProgram.cpp ('K') | « src/gpu/gl/builders/GrGLLegacyNvprProgramBuilder.h ('k') | src/gpu/gl/builders/GrGLNvprProgramBuilder.h » ('j') | src/gpu/gl/builders/GrGLProgramBuilder.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: src/gpu/gl/builders/GrGLLegacyNvprProgramBuilder.cpp

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

index c0c4fbb46ed17eb2426013590b30698da7a3d8e4..86b0d796873e4b3448238ccb1308c7b81e25d194 100644

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

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

@@ -21,7 +21,7 @@ int GrGLLegacyNvprProgramBuilder::addTexCoordSets(int count) {

return firstFreeCoordSet;

}

-void GrGLLegacyNvprProgramBuilder::emitTransforms(const GrFragmentStage& processorStage,

+void GrGLLegacyNvprProgramBuilder::emitTransforms(const GrPendingFragmentStage& processorStage,

GrGLProcessor::TransformedCoordsArray* outCoords,

GrGLInstalledFragProc* ifp) {

int numTransforms = processorStage.getProcessor()->numTransforms();

@@ -35,7 +35,7 @@ void GrGLLegacyNvprProgramBuilder::emitTransforms(const GrFragmentStage& process

SkString name;

for (int t = 0; t < numTransforms; ++t) {

- GrSLType type = processorStage.isPerspectiveCoordTransform(t, false) ? kVec3f_GrSLType :

+ GrSLType type = processorStage.isPerspectiveCoordTransform(t) ? kVec3f_GrSLType :

kVec2f_GrSLType;

joshualitt 2014/11/19 14:22:39 align

bsalomon 2014/11/19 15:04:43 Done.

name.printf("%s(gl_TexCoord[%i])", GrGLSLTypeString(type), texCoordIndex++);