src/gpu/gl/GrGLProgramDataManager.cpp - Issue 920933002: fix for uniform view matrix being uploaded but not used

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

Issue 920933002: fix for uniform view matrix being uploaded but not used (Closed) Base URL: https://skia.googlesource.com/skia.git@gp_cleanup_1

Patch Set: 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/GrGLProgramDataManager.cpp

diff --git a/src/gpu/gl/GrGLProgramDataManager.cpp b/src/gpu/gl/GrGLProgramDataManager.cpp

index 67b70417be0a462215892f74e57a84ca009dc726..9cd8d57f1826c399c5a8fea3f10f004156d46944 100644

--- a/src/gpu/gl/GrGLProgramDataManager.cpp

+++ b/src/gpu/gl/GrGLProgramDataManager.cpp

@@ -185,8 +185,7 @@ void GrGLProgramDataManager::setMatrix3f(UniformHandle u, const GrGLfloat matrix

const Uniform& uni = fUniforms[u.toProgramDataIndex()];

SkASSERT(uni.fType == kMat33f_GrSLType);

SkASSERT(GrGLShaderVar::kNonArray == uni.fArrayCount);

- // TODO: Re-enable this assert once texture matrices aren't forced on all effects

- // SkASSERT(kUnusedUniform != uni.fFSLocation || kUnusedUniform != uni.fVSLocation);

+ SkASSERT(kUnusedUniform != uni.fFSLocation || kUnusedUniform != uni.fVSLocation);

if (kUnusedUniform != uni.fFSLocation) {

GR_GL_CALL(fGpu->glInterface(), UniformMatrix3fv(uni.fFSLocation, 1, false, matrix));

}