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

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

Issue 1684063006: Add GrShaderFlags enum (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Bit->Flag Created 4 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/glsl/GrGLSLProgramBuilder.cpp ('k') | src/gpu/glsl/GrGLSLUniformHandler.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 "GrSwizzle.h" 8 #include "GrSwizzle.h"
9 #include "glsl/GrGLSLShaderBuilder.h" 9 #include "glsl/GrGLSLShaderBuilder.h"
10 #include "glsl/GrGLSLCaps.h" 10 #include "glsl/GrGLSLCaps.h"
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 151
152 GR_STATIC_ASSERT(0 == GrGLSLShaderBuilder::kOut_InterfaceQualifier); 152 GR_STATIC_ASSERT(0 == GrGLSLShaderBuilder::kOut_InterfaceQualifier);
153 GR_STATIC_ASSERT(SK_ARRAY_COUNT(interfaceQualifierNames) == kLastInterfaceQu alifier + 1); 153 GR_STATIC_ASSERT(SK_ARRAY_COUNT(interfaceQualifierNames) == kLastInterfaceQu alifier + 1);
154 } 154 }
155 155
156 void GrGLSLShaderBuilder::finalize(uint32_t visibility) { 156 void GrGLSLShaderBuilder::finalize(uint32_t visibility) {
157 SkASSERT(!fFinalized); 157 SkASSERT(!fFinalized);
158 this->versionDecl() = fProgramBuilder->glslCaps()->versionDeclString(); 158 this->versionDecl() = fProgramBuilder->glslCaps()->versionDeclString();
159 this->compileAndAppendLayoutQualifiers(); 159 this->compileAndAppendLayoutQualifiers();
160 SkASSERT(visibility); 160 SkASSERT(visibility);
161 fProgramBuilder->appendUniformDecls((GrGLSLUniformHandler::ShaderVisibility) visibility, 161 fProgramBuilder->appendUniformDecls((GrShaderFlags) visibility, &this->unifo rms());
162 &this->uniforms());
163 this->appendDecls(fInputs, &this->inputs()); 162 this->appendDecls(fInputs, &this->inputs());
164 this->appendDecls(fOutputs, &this->outputs()); 163 this->appendDecls(fOutputs, &this->outputs());
165 this->onFinalize(); 164 this->onFinalize();
166 // append the 'footer' to code 165 // append the 'footer' to code
167 this->code().append("}"); 166 this->code().append("}");
168 167
169 for (int i = 0; i <= fCodeIndex; i++) { 168 for (int i = 0; i <= fCodeIndex; i++) {
170 fCompilerStrings[i] = fShaderStrings[i].c_str(); 169 fCompilerStrings[i] = fShaderStrings[i].c_str();
171 fCompilerStringLengths[i] = (int)fShaderStrings[i].size(); 170 fCompilerStringLengths[i] = (int)fShaderStrings[i].size();
172 } 171 }
173 172
174 fFinalized = true; 173 fFinalized = true;
175 } 174 }
176 175
OLDNEW
« no previous file with comments | « src/gpu/glsl/GrGLSLProgramBuilder.cpp ('k') | src/gpu/glsl/GrGLSLUniformHandler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698