Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(179)

Side by Side 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:
View unified diff | Download patch
« no previous file with comments | « src/gpu/gl/GrGLGeometryProcessor.cpp ('k') | src/gpu/gl/GrGLProgramDataManager.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2014 Google Inc. 2 * Copyright 2014 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "GrGLPrimitiveProcessor.h" 8 #include "GrGLPrimitiveProcessor.h"
9 9
10 #include "builders/GrGLProgramBuilder.h" 10 #include "builders/GrGLProgramBuilder.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 57
58 void GrGLPrimitiveProcessor::addUniformViewMatrix(GrGLGPBuilder* pb) { 58 void GrGLPrimitiveProcessor::addUniformViewMatrix(GrGLGPBuilder* pb) {
59 fViewMatrixUniform = pb->addUniform(GrGLProgramBuilder::kVertex_Visibility, 59 fViewMatrixUniform = pb->addUniform(GrGLProgramBuilder::kVertex_Visibility,
60 kMat33f_GrSLType, kDefault_GrSLPrecision , 60 kMat33f_GrSLType, kDefault_GrSLPrecision ,
61 "uViewM", 61 "uViewM",
62 &fViewMatrixName); 62 &fViewMatrixName);
63 } 63 }
64 64
65 void GrGLPrimitiveProcessor::setUniformViewMatrix(const GrGLProgramDataManager& pdman, 65 void GrGLPrimitiveProcessor::setUniformViewMatrix(const GrGLProgramDataManager& pdman,
66 const SkMatrix& viewMatrix) { 66 const SkMatrix& viewMatrix) {
67 if (!fViewMatrix.cheapEqualTo(viewMatrix)) { 67 if (!viewMatrix.isIdentity() && !fViewMatrix.cheapEqualTo(viewMatrix)) {
68 SkASSERT(fViewMatrixUniform.isValid()); 68 SkASSERT(fViewMatrixUniform.isValid());
69 fViewMatrix = viewMatrix; 69 fViewMatrix = viewMatrix;
70 70
71 GrGLfloat viewMatrix[3 * 3]; 71 GrGLfloat viewMatrix[3 * 3];
72 GrGLGetMatrix<3>(viewMatrix, fViewMatrix); 72 GrGLGetMatrix<3>(viewMatrix, fViewMatrix);
73 pdman.setMatrix3f(fViewMatrixUniform, viewMatrix); 73 pdman.setMatrix3f(fViewMatrixUniform, viewMatrix);
74 } 74 }
75 } 75 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLGeometryProcessor.cpp ('k') | src/gpu/gl/GrGLProgramDataManager.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698