src/gpu/gl/builders/GrGLProgramBuilder.cpp - Issue 1144433002: Move copy-surface-as-draw fallback to GrGLGpu.

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 1144433002: Move copy-surface-as-draw fallback to GrGLGpu. (Closed) Base URL: https://skia.googlesource.com/skia.git@vares

Patch Set: remove incorrect assert Created 5 years, 7 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 28e1fba20cfca8eaf70e671414576be9bb6b48a6..95f75ffd448f167ca0cf5cb38e185b7c3f21b2a9 100644

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

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

@@ -343,8 +343,7 @@ void GrGLProgramBuilder::emitAndInstallXferProc(const GrXferProcessor& xp,

fFS.enableSecondaryOutput();

}

- // On any post 1.10 GLSL supporting GPU, we declare custom output

- if (k110_GrGLSLGeneration != fFS.fProgramBuilder->gpu()->glslGeneration()) {

+ if (this->ctxInfo().caps()->glslCaps()->mustDeclareFragmentShaderOutput()) {

fFS.enableCustomOutput();

}