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

Side by Side Diff: src/gpu/gl/GrGLShaderBuilder.cpp

Issue 12480002: Fixing some warnings on Linux (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « src/animator/SkScriptTokenizer.cpp ('k') | src/gpu/gr_unittests.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 2012 Google Inc. 2 * Copyright 2012 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 "gl/GrGLShaderBuilder.h" 8 #include "gl/GrGLShaderBuilder.h"
9 #include "gl/GrGLProgram.h" 9 #include "gl/GrGLProgram.h"
10 #include "gl/GrGLUniformHandle.h" 10 #include "gl/GrGLUniformHandle.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 , fUniformManager(uniformManager) 95 , fUniformManager(uniformManager)
96 , fCurrentStageIdx(kNonStageIdx) 96 , fCurrentStageIdx(kNonStageIdx)
97 , fSetupFragPosition(false) 97 , fSetupFragPosition(false)
98 , fRTHeightUniform(GrGLUniformManager::kInvalidUniformHandle) { 98 , fRTHeightUniform(GrGLUniformManager::kInvalidUniformHandle) {
99 99
100 fPositionVar = &fVSAttrs.push_back(); 100 fPositionVar = &fVSAttrs.push_back();
101 fPositionVar->set(kVec2f_GrSLType, GrGLShaderVar::kAttribute_TypeModifier, " aPosition"); 101 fPositionVar->set(kVec2f_GrSLType, GrGLShaderVar::kAttribute_TypeModifier, " aPosition");
102 } 102 }
103 103
104 void GrGLShaderBuilder::codeAppendf(ShaderType type, const char format[], va_lis t args) { 104 void GrGLShaderBuilder::codeAppendf(ShaderType type, const char format[], va_lis t args) {
105 SkString* string; 105 SkString* string = NULL;
106 switch (type) { 106 switch (type) {
107 case kVertex_ShaderType: 107 case kVertex_ShaderType:
108 string = &fVSCode; 108 string = &fVSCode;
109 break; 109 break;
110 case kGeometry_ShaderType: 110 case kGeometry_ShaderType:
111 string = &fGSCode; 111 string = &fGSCode;
112 break; 112 break;
113 case kFragment_ShaderType: 113 case kFragment_ShaderType:
114 string = &fFSCode; 114 string = &fFSCode;
115 break; 115 break;
116 default: 116 default:
117 GrCrash("Invalid shader type"); 117 GrCrash("Invalid shader type");
118 } 118 }
119 string->appendf(format, args); 119 string->appendf(format, args);
120 } 120 }
121 121
122 void GrGLShaderBuilder::codeAppend(ShaderType type, const char* str) { 122 void GrGLShaderBuilder::codeAppend(ShaderType type, const char* str) {
123 SkString* string; 123 SkString* string = NULL;
124 switch (type) { 124 switch (type) {
125 case kVertex_ShaderType: 125 case kVertex_ShaderType:
126 string = &fVSCode; 126 string = &fVSCode;
127 break; 127 break;
128 case kGeometry_ShaderType: 128 case kGeometry_ShaderType:
129 string = &fGSCode; 129 string = &fGSCode;
130 break; 130 break;
131 case kFragment_ShaderType: 131 case kFragment_ShaderType:
132 string = &fFSCode; 132 string = &fFSCode;
133 break; 133 break;
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 key, 501 key,
502 vsInCoord, 502 vsInCoord,
503 fsOutColor, 503 fsOutColor,
504 fsInColor, 504 fsInColor,
505 textureSamplers); 505 textureSamplers);
506 this->fVSCode.appendf("\t}\n"); 506 this->fVSCode.appendf("\t}\n");
507 this->fFSCode.appendf("\t}\n"); 507 this->fFSCode.appendf("\t}\n");
508 508
509 return glEffect; 509 return glEffect;
510 } 510 }
OLDNEW
« no previous file with comments | « src/animator/SkScriptTokenizer.cpp ('k') | src/gpu/gr_unittests.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698