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

Unified Diff: src/gpu/GrClipMaskManager.cpp

Issue 811373002: Remove GrCoordTransform::kPosition_CoordSet (Closed) Base URL: https://skia.googlesource.com/skia.git@jgm
Patch Set: fix warning Created 6 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/gpu/GrCoordTransform.h ('k') | src/gpu/GrSWMaskHelper.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrClipMaskManager.cpp
diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp
index 143add51c609443794428c4f7e995dc5323c2788..7f85801d998e882d00a13bac98bbbd0b1ee9395f 100644
--- a/src/gpu/GrClipMaskManager.cpp
+++ b/src/gpu/GrClipMaskManager.cpp
@@ -36,13 +36,11 @@ void setup_drawstate_aaclip(const SkIRect &devBound,
SkASSERT(drawState);
SkMatrix mat;
- // We want to use device coords to compute the texture coordinates. We set our matrix to be
- // equal to the view matrix followed by an offset to the devBound, and then a scaling matrix to
- // normalized coords. We apply this matrix to the vertex positions rather than local coords.
+ // We use device coords to compute the texture coordinates. We set our matrix to be a
+ // translation to the devBound, and then a scaling matrix to normalized coords.
mat.setIDiv(result->width(), result->height());
mat.preTranslate(SkIntToScalar(-devBound.fLeft),
SkIntToScalar(-devBound.fTop));
- mat.preConcat(drawState->getViewMatrix());
SkIRect domainTexels = SkIRect::MakeWH(devBound.width(), devBound.height());
// This could be a long-lived effect that is cached with the alpha-mask.
@@ -52,7 +50,7 @@ void setup_drawstate_aaclip(const SkIRect &devBound,
GrTextureDomain::MakeTexelDomain(result, domainTexels),
GrTextureDomain::kDecal_Mode,
GrTextureParams::kNone_FilterMode,
- kPosition_GrCoordSet))->unref();
+ kDevice_GrCoordSet))->unref();
}
bool path_needs_SW_renderer(GrContext* context,
« no previous file with comments | « include/gpu/GrCoordTransform.h ('k') | src/gpu/GrSWMaskHelper.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698