src/gpu/effects/GrTextureDomain.cpp - Issue 1420033002: Revert of Add version string and force highp NDS transfrom to GLSLCaps

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/effects/GrTextureDomain.cpp

Issue 1420033002: Revert of Add version string and force highp NDS transfrom to GLSLCaps (Closed) Base URL: https://skia.googlesource.com/skia.git@renameShaderVar

Patch Set: Created 5 years, 2 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:

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

Download patch

Index: src/gpu/effects/GrTextureDomain.cpp

diff --git a/src/gpu/effects/GrTextureDomain.cpp b/src/gpu/effects/GrTextureDomain.cpp

index 93d3afb8c430aeae6599723e8c17ec4a746ae0d1..19882423fe75b9d3c7fbdeb6f36b6fb542ff1d49 100644

--- a/src/gpu/effects/GrTextureDomain.cpp

+++ b/src/gpu/effects/GrTextureDomain.cpp

@@ -87,7 +87,7 @@

GrGLShaderBuilder::ShaderBlock block(builder);

const char* domain = fDomainName.c_str();

- if (!program->glslCaps()->canUseAnyFunctionInShader()) {

+ if (kImagination_GrGLVendor == program->ctxInfo().vendor()) {

// On the NexusS and GalaxyNexus, the other path (with the 'any'

// call) causes the compilation error "Calls to any function that

// may require a gradient calculation inside a conditional block

« no previous file with comments | « bench/GLVertexAttributesBench.cpp ('k') | src/gpu/gl/GrGLCaps.h » ('j') | no next file with comments »