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

Side by Side Diff: src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 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/gl/builders/GrGLShaderBuilder.cpp ('k') | src/gpu/gl/debug/GrBufferObj.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 "GrGLVertexShaderBuilder.h" 8 #include "GrGLVertexShaderBuilder.h"
9 #include "GrGLProgramBuilder.h" 9 #include "GrGLProgramBuilder.h"
10 #include "../GrGLGLSL.h" 10 #include "../GrGLGLSL.h"
11 #include "../GrGLGpu.h" 11 #include "../GrGLGpu.h"
12 12
13 #define GL_CALL(X) GR_GL_CALL(fProgramBuilder->gpu()->glInterface(), X) 13 #define GL_CALL(X) GR_GL_CALL(fProgramBuilder->gpu()->glInterface(), X)
14 #define GL_CALL_RET(R, X) GR_GL_CALL_RET(fProgramBuilder->gpu()->glInterface(), R, X) 14 #define GL_CALL_RET(R, X) GR_GL_CALL_RET(fProgramBuilder->gpu()->glInterface(), R, X)
15 15
16 GrGLVertexBuilder::GrGLVertexBuilder(GrGLProgramBuilder* program) 16 GrGLVertexBuilder::GrGLVertexBuilder(GrGLProgramBuilder* program)
17 : INHERITED(program) 17 : INHERITED(program)
18 , fRtAdjustName(NULL) { 18 , fRtAdjustName(nullptr) {
19 } 19 }
20 20
21 void GrGLVertexBuilder::addVarying(const char* name, GrGLVarying* v) { 21 void GrGLVertexBuilder::addVarying(const char* name, GrGLVarying* v) {
22 fOutputs.push_back(); 22 fOutputs.push_back();
23 fOutputs.back().setType(v->fType); 23 fOutputs.back().setType(v->fType);
24 fOutputs.back().setTypeModifier(GrGLShaderVar::kVaryingOut_TypeModifier); 24 fOutputs.back().setTypeModifier(GrGLShaderVar::kVaryingOut_TypeModifier);
25 fProgramBuilder->nameVariable(fOutputs.back().accessName(), 'v', name); 25 fProgramBuilder->nameVariable(fOutputs.back().accessName(), 'v', name);
26 v->fVsOut = fOutputs.back().getName().c_str(); 26 v->fVsOut = fOutputs.back().getName().c_str();
27 } 27 }
28 28
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 for (int i = 0; i < fInputs.count(); ++i) { 99 for (int i = 0; i < fInputs.count(); ++i) {
100 const GrGLShaderVar& attr = fInputs[i]; 100 const GrGLShaderVar& attr = fInputs[i];
101 // if attribute already added, don't add it again 101 // if attribute already added, don't add it again
102 if (attr.getName().equals(var.getName())) { 102 if (attr.getName().equals(var.getName())) {
103 return false; 103 return false;
104 } 104 }
105 } 105 }
106 fInputs.push_back(var); 106 fInputs.push_back(var);
107 return true; 107 return true;
108 } 108 }
OLDNEW
« no previous file with comments | « src/gpu/gl/builders/GrGLShaderBuilder.cpp ('k') | src/gpu/gl/debug/GrBufferObj.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698