diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-16 14:31:26 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-16 14:31:26 +0000 |
| commit | f6eac8af585e44d56e6b18d269e6c34f9917ea88 (patch) | |
| tree | 46332930405593186d0956fb29f093cd0afff80f /src/gpu/GrClipMaskManager.cpp | |
| parent | b022177777c3602c47bb71c07920e63a261c5038 (diff) | |
Revert r5962 because of failures.
git-svn-id: http://skia.googlecode.com/svn/trunk@5963 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/GrClipMaskManager.cpp')
| -rw-r--r-- | src/gpu/GrClipMaskManager.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp index aa0c0249a8..322fba146a 100644 --- a/src/gpu/GrClipMaskManager.cpp +++ b/src/gpu/GrClipMaskManager.cpp @@ -41,7 +41,9 @@ void setup_drawstate_aaclip(GrGpu* gpu, SkIntToScalar(-devBound.fTop)); mat.preConcat(drawState->getViewMatrix()); - drawState->createTextureEffect(maskStage, result, mat); + drawState->sampler(maskStage)->reset(mat); + + drawState->createTextureEffect(maskStage, result); } bool path_needs_SW_renderer(GrContext* context, @@ -493,7 +495,8 @@ void GrClipMaskManager::drawTexture(GrTexture* target, GrMatrix sampleM; sampleM.setIDiv(texture->width(), texture->height()); - drawState->createTextureEffect(0, texture, sampleM); + drawState->sampler(0)->reset(sampleM); + drawState->createTextureEffect(0, texture); GrRect rect = GrRect::MakeWH(SkIntToScalar(target->width()), SkIntToScalar(target->height())); |