diff options
author | 2013-03-20 17:47:16 +0000 | |
---|---|---|
committer | 2013-03-20 17:47:16 +0000 | |
commit | 67e7cde5c5e59a8f1de7ee28276b8193ecb2bc7f (patch) | |
tree | fbb2c63213570deb6062b3eb8e9ba1a13c0431d4 /src/gpu/GrClipMaskManager.cpp | |
parent | 113994051b41366a7b25851d05cd56e89866a33b (diff) |
revert 8265-8264 (broke build)
git-svn-id: http://skia.googlecode.com/svn/trunk@8268 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/GrClipMaskManager.cpp')
-rw-r--r-- | src/gpu/GrClipMaskManager.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp index 6415859db9..99068c75ed 100644 --- a/src/gpu/GrClipMaskManager.cpp +++ b/src/gpu/GrClipMaskManager.cpp @@ -40,9 +40,6 @@ void setup_drawstate_aaclip(GrGpu* gpu, static const int kMaskStage = GrPaint::kTotalStages+1; 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. mat.setIDiv(result->width(), result->height()); mat.preTranslate(SkIntToScalar(-devBound.fLeft), SkIntToScalar(-devBound.fTop)); @@ -54,9 +51,7 @@ void setup_drawstate_aaclip(GrGpu* gpu, GrTextureDomainEffect::Create(result, mat, GrTextureDomainEffect::MakeTexelDomain(result, domainTexels), - GrTextureDomainEffect::kDecal_WrapMode, - false, - GrEffect::kPosition_CoordsType))->unref(); + GrTextureDomainEffect::kDecal_WrapMode))->unref(); } bool path_needs_SW_renderer(GrContext* context, @@ -359,8 +354,7 @@ void GrClipMaskManager::mergeMask(GrTexture* dstMask, GrTextureDomainEffect::Create(srcMask, sampleM, GrTextureDomainEffect::MakeTexelDomain(srcMask, srcBound), - GrTextureDomainEffect::kDecal_WrapMode, - false))->unref(); + GrTextureDomainEffect::kDecal_WrapMode))->unref(); fGpu->drawSimpleRect(SkRect::MakeFromIRect(dstBound), NULL); drawState->disableStage(0); |