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

Side by Side Diff: src/gpu/gl/builders/GrGLShaderBuilder.h

Issue 544233002: "NULL !=" = NULL (Closed) Base URL: https://skia.googlesource.com/skia.git@are
Patch Set: rebase Created 6 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/GrGLProgramBuilder.cpp ('k') | src/gpu/gl/builders/GrGLShaderBuilder.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 #ifndef GrGLShaderBuilder_DEFINED 8 #ifndef GrGLShaderBuilder_DEFINED
9 #define GrGLShaderBuilder_DEFINED 9 #define GrGLShaderBuilder_DEFINED
10 10
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 * Get parent builder for adding uniforms 111 * Get parent builder for adding uniforms
112 */ 112 */
113 GrGLProgramBuilder* getProgramBuilder() { return fProgramBuilder; } 113 GrGLProgramBuilder* getProgramBuilder() { return fProgramBuilder; }
114 114
115 /** 115 /**
116 * Helper for begining and ending a block in the fragment code. 116 * Helper for begining and ending a block in the fragment code.
117 */ 117 */
118 class ShaderBlock { 118 class ShaderBlock {
119 public: 119 public:
120 ShaderBlock(GrGLShaderBuilder* builder) : fBuilder(builder) { 120 ShaderBlock(GrGLShaderBuilder* builder) : fBuilder(builder) {
121 SkASSERT(NULL != builder); 121 SkASSERT(builder);
122 fBuilder->codeAppend("{"); 122 fBuilder->codeAppend("{");
123 } 123 }
124 124
125 ~ShaderBlock() { 125 ~ShaderBlock() {
126 fBuilder->codeAppend("}"); 126 fBuilder->codeAppend("}");
127 } 127 }
128 private: 128 private:
129 GrGLShaderBuilder* fBuilder; 129 GrGLShaderBuilder* fBuilder;
130 }; 130 };
131 protected: 131 protected:
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 public: 166 public:
167 GrGLFullShaderBuilder(GrGLFullProgramBuilder* program); 167 GrGLFullShaderBuilder(GrGLFullProgramBuilder* program);
168 168
169 GrGLFullProgramBuilder* fullProgramBuilder() { return fFullProgramBuilder; } 169 GrGLFullProgramBuilder* fullProgramBuilder() { return fFullProgramBuilder; }
170 protected: 170 protected:
171 GrGLFullProgramBuilder* fFullProgramBuilder; 171 GrGLFullProgramBuilder* fFullProgramBuilder;
172 private: 172 private:
173 typedef GrGLShaderBuilder INHERITED; 173 typedef GrGLShaderBuilder INHERITED;
174 }; 174 };
175 #endif 175 #endif
OLDNEW
« no previous file with comments | « src/gpu/gl/builders/GrGLProgramBuilder.cpp ('k') | src/gpu/gl/builders/GrGLShaderBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698