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

Side by Side Diff: tests/GLProgramsTest.cpp

Issue 628293002: Plumb OptDrawState down to VertexShaderBuilder (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 2 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/GrGLVertexShaderBuilder.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 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 dstTexture, 325 dstTexture,
326 geometryProcessor.get(), 326 geometryProcessor.get(),
327 stages.get(), 327 stages.get(),
328 numColorStages, 328 numColorStages,
329 numCoverageStages, 329 numCoverageStages,
330 currAttribIndex, 330 currAttribIndex,
331 drawType)) { 331 drawType)) {
332 return false; 332 return false;
333 } 333 }
334 334
335 SkAutoTUnref<GrOptDrawState> optState(this->getDrawState().createOptStat e(*this->caps()));
335 SkAutoTUnref<GrGLProgram> program(GrGLProgram::Create(this, 336 SkAutoTUnref<GrGLProgram> program(GrGLProgram::Create(this,
337 *optState.get(),
336 pdesc, 338 pdesc,
337 geometryProcessor. get(), 339 geometryProcessor. get(),
338 stages, 340 stages,
339 stages + numColorS tages)); 341 stages + numColorS tages));
340 for (int s = 0; s < numStages; ++s) { 342 for (int s = 0; s < numStages; ++s) {
341 SkDELETE(stages[s]); 343 SkDELETE(stages[s]);
342 } 344 }
343 if (NULL == program.get()) { 345 if (NULL == program.get()) {
344 return false; 346 return false;
345 } 347 }
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 SkRect::MakeWH(SK_Scalar1, SK_Scalar1), SK_Scalar1)); 388 SkRect::MakeWH(SK_Scalar1, SK_Scalar1), SK_Scalar1));
387 GrConfigConversionEffect::Create(NULL, 389 GrConfigConversionEffect::Create(NULL,
388 false, 390 false,
389 GrConfigConversionEffect::kNone_PMConversio n, 391 GrConfigConversionEffect::kNone_PMConversio n,
390 SkMatrix::I()); 392 SkMatrix::I());
391 SkScalar matrix[20]; 393 SkScalar matrix[20];
392 SkAutoTUnref<SkColorMatrixFilter> cmf(SkColorMatrixFilter::Create(matrix)); 394 SkAutoTUnref<SkColorMatrixFilter> cmf(SkColorMatrixFilter::Create(matrix));
393 } 395 }
394 396
395 #endif 397 #endif
OLDNEW
« no previous file with comments | « src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698