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

Side by Side Diff: src/gpu/glsl/GrGLSLPrimitiveProcessor.cpp

Issue 2339203002: Stop flattening GrCoordTransforms in parent GrFragmentProcessors. (Closed)
Patch Set: Fix issue of taking ref to a temporary Created 4 years, 3 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/glsl/GrGLSLPrimitiveProcessor.h ('k') | src/gpu/glsl/GrGLSLProgramBuilder.h » ('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 "GrGLSLPrimitiveProcessor.h" 8 #include "GrGLSLPrimitiveProcessor.h"
9 9
10 #include "GrCoordTransform.h" 10 #include "GrCoordTransform.h"
(...skipping 29 matching lines...) Expand all
40 UniformHandle* colorUniform) { 40 UniformHandle* colorUniform) {
41 SkASSERT(colorUniform); 41 SkASSERT(colorUniform);
42 const char* stagedLocalVarName; 42 const char* stagedLocalVarName;
43 *colorUniform = uniformHandler->addUniform(kFragment_GrShaderFlag, 43 *colorUniform = uniformHandler->addUniform(kFragment_GrShaderFlag,
44 kVec4f_GrSLType, 44 kVec4f_GrSLType,
45 kDefault_GrSLPrecision, 45 kDefault_GrSLPrecision,
46 "Color", 46 "Color",
47 &stagedLocalVarName); 47 &stagedLocalVarName);
48 fragBuilder->codeAppendf("%s = %s;", outputName, stagedLocalVarName); 48 fragBuilder->codeAppendf("%s = %s;", outputName, stagedLocalVarName);
49 } 49 }
50
51 //////////////////////////////////////////////////////////////////////////////
52
53 const GrCoordTransform* GrGLSLPrimitiveProcessor::FPCoordTransformHandler::nextC oordTransform() {
54 #ifdef SK_DEBUG
55 SkASSERT(nullptr == fCurr || fAddedCoord);
56 fAddedCoord = false;
57 fCurr = fIter.next();
58 return fCurr;
59 #else
60 return fIter.next();
61 #endif
62 }
OLDNEW
« no previous file with comments | « src/gpu/glsl/GrGLSLPrimitiveProcessor.h ('k') | src/gpu/glsl/GrGLSLProgramBuilder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698