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

Side by Side Diff: src/gpu/GrDefaultGeoProcFactory.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/GrAAConvexPathRenderer.cpp ('k') | src/gpu/GrGeometryProcessor.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 "GrDefaultGeoProcFactory.h" 8 #include "GrDefaultGeoProcFactory.h"
9 9
10 #include "GrInvariantOutput.h" 10 #include "GrInvariantOutput.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 GrGLVertexBuilder* vsBuilder = pb->getVertexShaderBuilder(); 88 GrGLVertexBuilder* vsBuilder = pb->getVertexShaderBuilder();
89 GrGLGPFragmentBuilder* fs = args.fPB->getFragmentShaderBuilder(); 89 GrGLGPFragmentBuilder* fs = args.fPB->getFragmentShaderBuilder();
90 const BatchTracker& local = args.fBT.cast<BatchTracker>(); 90 const BatchTracker& local = args.fBT.cast<BatchTracker>();
91 91
92 // emit attributes 92 // emit attributes
93 vsBuilder->emitAttributes(gp); 93 vsBuilder->emitAttributes(gp);
94 94
95 // Setup pass through color 95 // Setup pass through color
96 this->setupColorPassThrough(pb, local.fInputColorType, args.fOutputC olor, gp.inColor(), 96 this->setupColorPassThrough(pb, local.fInputColorType, args.fOutputC olor, gp.inColor(),
97 &fColorUniform); 97 &fColorUniform);
98
99 // setup uniform viewMatrix
100 this->addUniformViewMatrix(pb);
101
102 // Setup position 98 // Setup position
103 SetupPosition(vsBuilder, gpArgs, gp.inPosition()->fName, 99 this->setupPosition(pb, gpArgs, gp.inPosition()->fName, gp.viewMatri x());
104 gp.viewMatrix(), this->uViewM());
105 100
106 if (gp.inLocalCoords()) { 101 if (gp.inLocalCoords()) {
107 // emit transforms with explicit local coords 102 // emit transforms with explicit local coords
108 this->emitTransforms(pb, gpArgs->fPositionVar, gp.inLocalCoords( )->fName, 103 this->emitTransforms(pb, gpArgs->fPositionVar, gp.inLocalCoords( )->fName,
109 gp.localMatrix(), args.fTransformsIn, args. fTransformsOut); 104 gp.localMatrix(), args.fTransformsIn, args. fTransformsOut);
110 } else { 105 } else {
111 // emit transforms with position 106 // emit transforms with position
112 this->emitTransforms(pb, gpArgs->fPositionVar, gp.inPosition()-> fName, 107 this->emitTransforms(pb, gpArgs->fPositionVar, gp.inPosition()-> fName,
113 gp.localMatrix(), args.fTransformsIn, args. fTransformsOut); 108 gp.localMatrix(), args.fTransformsIn, args. fTransformsOut);
114 } 109 }
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 const SkMatrix& local Matrix, 277 const SkMatrix& local Matrix,
283 bool opaqueVertexColo rs, 278 bool opaqueVertexColo rs,
284 uint8_t coverage) { 279 uint8_t coverage) {
285 return DefaultGeoProc::Create(gpTypeFlags, 280 return DefaultGeoProc::Create(gpTypeFlags,
286 color, 281 color,
287 viewMatrix, 282 viewMatrix,
288 localMatrix, 283 localMatrix,
289 opaqueVertexColors, 284 opaqueVertexColors,
290 coverage); 285 coverage);
291 } 286 }
OLDNEW
« no previous file with comments | « src/gpu/GrAAConvexPathRenderer.cpp ('k') | src/gpu/GrGeometryProcessor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698