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

Side by Side Diff: tests/GLProgramsTest.cpp

Issue 175383002: Fix warnings on Ubuntu13 (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Respond to comments. Created 6 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/animator/SkDisplayType.cpp ('k') | no next file » | 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 /* 2 /*
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 // This is a GPU-backend specific test. It relies on static intializers to work 9 // This is a GPU-backend specific test. It relies on static intializers to work
10 10
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 static const int stop = -1; 147 static const int stop = -1;
148 if (t == stop) { 148 if (t == stop) {
149 int breakpointhere = 9; 149 int breakpointhere = 9;
150 } 150 }
151 #endif 151 #endif
152 152
153 GrGLProgramDesc pdesc; 153 GrGLProgramDesc pdesc;
154 154
155 int currAttribIndex = 1; // we need to always leave room for position 155 int currAttribIndex = 1; // we need to always leave room for position
156 int currTextureCoordSet = 0; 156 int currTextureCoordSet = 0;
157 int attribIndices[2]; 157 int attribIndices[2] = { 0, 0 };
158 GrTexture* dummyTextures[] = {dummyTexture1.get(), dummyTexture2.get()}; 158 GrTexture* dummyTextures[] = {dummyTexture1.get(), dummyTexture2.get()};
159 159
160 int numStages = random.nextULessThan(maxStages + 1); 160 int numStages = random.nextULessThan(maxStages + 1);
161 int numColorStages = random.nextULessThan(numStages + 1); 161 int numColorStages = random.nextULessThan(numStages + 1);
162 int numCoverageStages = numStages - numColorStages; 162 int numCoverageStages = numStages - numColorStages;
163 163
164 SkAutoSTMalloc<8, const GrEffectStage*> stages(numStages); 164 SkAutoSTMalloc<8, const GrEffectStage*> stages(numStages);
165 165
166 bool useFixedFunctionTexturing = this->shouldUseFixedFunctionTexturing() ; 166 bool useFixedFunctionTexturing = this->shouldUseFixedFunctionTexturing() ;
167 167
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 SkMagnifierImageFilter mag(SkRect::MakeWH(SK_Scalar1, SK_Scalar1), SK_Scalar 1); 260 SkMagnifierImageFilter mag(SkRect::MakeWH(SK_Scalar1, SK_Scalar1), SK_Scalar 1);
261 GrConfigConversionEffect::Create(NULL, 261 GrConfigConversionEffect::Create(NULL,
262 false, 262 false,
263 GrConfigConversionEffect::kNone_PMConversio n, 263 GrConfigConversionEffect::kNone_PMConversio n,
264 SkMatrix::I()); 264 SkMatrix::I());
265 SkScalar matrix[20]; 265 SkScalar matrix[20];
266 SkColorMatrixFilter cmf(matrix); 266 SkColorMatrixFilter cmf(matrix);
267 } 267 }
268 268
269 #endif 269 #endif
OLDNEW
« no previous file with comments | « src/animator/SkDisplayType.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698