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

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

Issue 818233002: Remove coordchanges from drawstate (Closed) Base URL: https://skia.googlesource.com/skia.git@coord-change-off-paint
Patch Set: adding test to ignore Created 5 years, 11 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/GrOvalRenderer.cpp ('k') | src/gpu/GrSoftwarePathRenderer.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 "GrSWMaskHelper.h" 8 #include "GrSWMaskHelper.h"
9 9
10 #include "GrDrawState.h" 10 #include "GrDrawState.h"
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 helper.toTexture(texture); 343 helper.toTexture(texture);
344 344
345 return texture; 345 return texture;
346 } 346 }
347 347
348 void GrSWMaskHelper::DrawToTargetWithPathMask(GrTexture* texture, 348 void GrSWMaskHelper::DrawToTargetWithPathMask(GrTexture* texture,
349 GrDrawTarget* target, 349 GrDrawTarget* target,
350 GrDrawState* drawState, 350 GrDrawState* drawState,
351 GrColor color, 351 GrColor color,
352 const SkIRect& rect) { 352 const SkIRect& rect) {
353 GrDrawState::AutoViewMatrixRestore avmr; 353 SkMatrix invert;
354 if (!avmr.setIdentity(drawState)) { 354 if (!drawState->getViewMatrix().invert(&invert)) {
355 return; 355 return;
356 } 356 }
357 GrDrawState::AutoViewMatrixRestore avmr(drawState);
357 GrDrawState::AutoRestoreEffects are(drawState); 358 GrDrawState::AutoRestoreEffects are(drawState);
358 359
359 SkRect dstRect = SkRect::MakeLTRB(SK_Scalar1 * rect.fLeft, 360 SkRect dstRect = SkRect::MakeLTRB(SK_Scalar1 * rect.fLeft,
360 SK_Scalar1 * rect.fTop, 361 SK_Scalar1 * rect.fTop,
361 SK_Scalar1 * rect.fRight, 362 SK_Scalar1 * rect.fRight,
362 SK_Scalar1 * rect.fBottom); 363 SK_Scalar1 * rect.fBottom);
363 364
364 // We use device coords to compute the texture coordinates. We take the devi ce coords and apply 365 // We use device coords to compute the texture coordinates. We take the devi ce coords and apply
365 // a translation so that the top-left of the device bounds maps to 0,0, and then a scaling 366 // a translation so that the top-left of the device bounds maps to 0,0, and then a scaling
366 // matrix to normalized coords. 367 // matrix to normalized coords.
367 SkMatrix maskMatrix; 368 SkMatrix maskMatrix;
368 maskMatrix.setIDiv(texture->width(), texture->height()); 369 maskMatrix.setIDiv(texture->width(), texture->height());
369 maskMatrix.preTranslate(SkIntToScalar(-rect.fLeft), SkIntToScalar(-rect.fTop )); 370 maskMatrix.preTranslate(SkIntToScalar(-rect.fLeft), SkIntToScalar(-rect.fTop ));
370 371
371 drawState->addCoverageProcessor( 372 drawState->addCoverageProcessor(
372 GrSimpleTextureEffect::Create(texture, 373 GrSimpleTextureEffect::Create(texture,
373 maskMatrix, 374 maskMatrix,
374 GrTextureParams::kNone_Fi lterMode, 375 GrTextureParams::kNone_Fi lterMode,
375 kDevice_GrCoordSet))->unr ef(); 376 kDevice_GrCoordSet))->unr ef();
376 377
377 target->drawSimpleRect(drawState, color, dstRect); 378 target->drawRect(drawState, color, dstRect, NULL, &invert);
378 } 379 }
OLDNEW
« no previous file with comments | « src/gpu/GrOvalRenderer.cpp ('k') | src/gpu/GrSoftwarePathRenderer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698