src/gpu/gl/GrGLPrimitiveProcessor.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/GrGLPrimitiveProcessor.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/GrGLPrimitiveProcessor.cpp

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

index 335dc4fe5f973ea25d42771e5fb75aefed2402f2..2bb595af0140ea2b4e3755e852fac1ec778a0e41 100644

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

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

@@ -64,7 +64,7 @@ void GrGLPrimitiveProcessor::addUniformViewMatrix(GrGLGPBuilder* pb) {

void GrGLPrimitiveProcessor::setUniformViewMatrix(const GrGLProgramDataManager& pdman,

const SkMatrix& viewMatrix) {

- if (!fViewMatrix.cheapEqualTo(viewMatrix)) {

+ if (!viewMatrix.isIdentity() && !fViewMatrix.cheapEqualTo(viewMatrix)) {

SkASSERT(fViewMatrixUniform.isValid());

fViewMatrix = viewMatrix;

« no previous file with comments | « src/gpu/gl/GrGLGeometryProcessor.cpp ('k') | src/gpu/gl/GrGLProgramDataManager.cpp » ('j') | no next file with comments »