diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-07-25 21:27:09 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-07-25 21:27:09 +0000 |
| commit | b8670998a59d305cd22a3c0cbdc6e075b0a37a6e (patch) | |
| tree | 76791b806a3a6608e5a5735150c0535dc50a872a /src/gpu/GrClipMaskManager.cpp | |
| parent | cc90505674cd845fcbebd7e0654c3ff04a2e4f25 (diff) | |
Move filter/wrap out of GrSamplerState into GrTextureParams
Review URL: http://codereview.appspot.com/6440046/
git-svn-id: http://skia.googlecode.com/svn/trunk@4773 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/GrClipMaskManager.cpp')
| -rw-r--r-- | src/gpu/GrClipMaskManager.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp index 4deebf4218..d7287ea0ec 100644 --- a/src/gpu/GrClipMaskManager.cpp +++ b/src/gpu/GrClipMaskManager.cpp @@ -37,9 +37,7 @@ void setup_drawstate_aaclip(GrGpu* gpu, mat.preTranslate(SkIntToScalar(-bound.fLeft), SkIntToScalar(-bound.fTop)); mat.preConcat(drawState->getViewMatrix()); - drawState->sampler(maskStage)->reset(GrSamplerState::kClamp_WrapMode, - GrSamplerState::kNearest_Filter, - mat); + drawState->sampler(maskStage)->reset(mat); drawState->createTextureEffect(maskStage, result); } @@ -481,9 +479,7 @@ void GrClipMaskManager::drawTexture(GrTexture* target, GrMatrix sampleM; sampleM.setIDiv(texture->width(), texture->height()); - drawState->sampler(0)->reset(GrSamplerState::kClamp_WrapMode, - GrSamplerState::kNearest_Filter, - sampleM); + drawState->sampler(0)->reset(sampleM); drawState->createTextureEffect(0, texture); GrRect rect = GrRect::MakeWH(SkIntToScalar(target->width()), |