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

Side by Side Diff: src/gpu/GrSWMaskHelper.cpp

Issue 1228763005: small cleanups after fixing const of GrPipelineBuilder on DrawTarget (Closed) Base URL: https://skia.googlesource.com/skia.git@const-fix3
Patch Set: tweaks Created 5 years, 5 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/GrPipelineBuilder.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 * 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 "GrSWMaskHelper.h" 8 #include "GrSWMaskHelper.h"
9 9
10 #include "GrPipelineBuilder.h" 10 #include "GrPipelineBuilder.h"
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 void GrSWMaskHelper::DrawToTargetWithPathMask(GrTexture* texture, 346 void GrSWMaskHelper::DrawToTargetWithPathMask(GrTexture* texture,
347 GrDrawTarget* target, 347 GrDrawTarget* target,
348 GrPipelineBuilder* pipelineBuilder , 348 GrPipelineBuilder* pipelineBuilder ,
349 GrColor color, 349 GrColor color,
350 const SkMatrix& viewMatrix, 350 const SkMatrix& viewMatrix,
351 const SkIRect& rect) { 351 const SkIRect& rect) {
352 SkMatrix invert; 352 SkMatrix invert;
353 if (!viewMatrix.invert(&invert)) { 353 if (!viewMatrix.invert(&invert)) {
354 return; 354 return;
355 } 355 }
356 GrPipelineBuilder::AutoRestoreFragmentProcessors arfp(pipelineBuilder); 356 GrPipelineBuilder::AutoRestoreFragmentProcessorState arfps(*pipelineBuilder) ;
357 357
358 SkRect dstRect = SkRect::MakeLTRB(SK_Scalar1 * rect.fLeft, 358 SkRect dstRect = SkRect::MakeLTRB(SK_Scalar1 * rect.fLeft,
359 SK_Scalar1 * rect.fTop, 359 SK_Scalar1 * rect.fTop,
360 SK_Scalar1 * rect.fRight, 360 SK_Scalar1 * rect.fRight,
361 SK_Scalar1 * rect.fBottom); 361 SK_Scalar1 * rect.fBottom);
362 362
363 // We use device coords to compute the texture coordinates. We take the devi ce coords and apply 363 // We use device coords to compute the texture coordinates. We take the devi ce coords and apply
364 // a translation so that the top-left of the device bounds maps to 0,0, and then a scaling 364 // a translation so that the top-left of the device bounds maps to 0,0, and then a scaling
365 // matrix to normalized coords. 365 // matrix to normalized coords.
366 SkMatrix maskMatrix; 366 SkMatrix maskMatrix;
367 maskMatrix.setIDiv(texture->width(), texture->height()); 367 maskMatrix.setIDiv(texture->width(), texture->height());
368 maskMatrix.preTranslate(SkIntToScalar(-rect.fLeft), SkIntToScalar(-rect.fTop )); 368 maskMatrix.preTranslate(SkIntToScalar(-rect.fLeft), SkIntToScalar(-rect.fTop ));
369 369
370 pipelineBuilder->addCoverageProcessor( 370 pipelineBuilder->addCoverageProcessor(
371 GrSimpleTextureEffect::Create(pipelineBuilder->getProce ssorDataManager(), 371 GrSimpleTextureEffect::Create(pipelineBuilder->getProce ssorDataManager(),
372 texture, 372 texture,
373 maskMatrix, 373 maskMatrix,
374 GrTextureParams::kNone_Fi lterMode, 374 GrTextureParams::kNone_Fi lterMode,
375 kDevice_GrCoordSet))->unr ef(); 375 kDevice_GrCoordSet))->unr ef();
376 376
377 target->drawBWRect(*pipelineBuilder, color, SkMatrix::I(), dstRect, NULL, &i nvert); 377 target->drawBWRect(*pipelineBuilder, color, SkMatrix::I(), dstRect, NULL, &i nvert);
378 } 378 }
OLDNEW
« no previous file with comments | « src/gpu/GrPipelineBuilder.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698