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/effects | |
| 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/effects')
| -rw-r--r-- | src/effects/SkGradientShader.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/effects/SkGradientShader.cpp b/src/effects/SkGradientShader.cpp index 7a55bbbcc7..ad27cd080f 100644 --- a/src/effects/SkGradientShader.cpp +++ b/src/effects/SkGradientShader.cpp @@ -1050,9 +1050,9 @@ GrCustomStage* Linear_Gradient::asNewCustomStage(GrContext* context, GrSamplerState* sampler) const { SkASSERT(NULL != context && NULL != sampler); sampler->matrix()->preConcat(fPtsToUnit); - sampler->setWrapX(sk_tile_mode_to_grwrap(fTileMode)); - sampler->setWrapY(sk_tile_mode_to_grwrap(kClamp_TileMode)); - sampler->setFilter(GrSamplerState::kBilinear_Filter); + sampler->textureParams()->setTileModeX(fTileMode); + sampler->textureParams()->setTileModeY(kClamp_TileMode); + sampler->textureParams()->setBilerp(true); return SkNEW_ARGS(GrLinearGradient, (context, *this, sampler)); } @@ -1468,9 +1468,9 @@ public: GrSamplerState* sampler) const SK_OVERRIDE { SkASSERT(NULL != context && NULL != sampler); sampler->matrix()->preConcat(fPtsToUnit); - sampler->setWrapX(sk_tile_mode_to_grwrap(fTileMode)); - sampler->setWrapY(sk_tile_mode_to_grwrap(kClamp_TileMode)); - sampler->setFilter(GrSamplerState::kBilinear_Filter); + sampler->textureParams()->setTileModeX(fTileMode); + sampler->textureParams()->setTileModeY(kClamp_TileMode); + sampler->textureParams()->setBilerp(true); return SkNEW_ARGS(GrRadialGradient, (context, *this, sampler)); } @@ -1930,9 +1930,9 @@ public: sampler->matrix()->reset(); } sampler->matrix()->preConcat(fPtsToUnit); - sampler->setWrapX(sk_tile_mode_to_grwrap(fTileMode)); - sampler->setWrapY(sk_tile_mode_to_grwrap(kClamp_TileMode)); - sampler->setFilter(GrSamplerState::kBilinear_Filter); + sampler->textureParams()->setTileModeX(fTileMode); + sampler->textureParams()->setTileModeY(kClamp_TileMode); + sampler->textureParams()->setBilerp(true); return SkNEW_ARGS(GrRadial2Gradient, (context, *this, sampler, diffLen, fStartRadius, fDiffRadius)); } @@ -2395,9 +2395,9 @@ public: sampler->matrix()->reset(); } sampler->matrix()->preTranslate(-fCenter1.fX, -fCenter1.fY); - sampler->setWrapX(sk_tile_mode_to_grwrap(fTileMode)); - sampler->setWrapY(sk_tile_mode_to_grwrap(kClamp_TileMode)); - sampler->setFilter(GrSamplerState::kBilinear_Filter); + sampler->textureParams()->setTileModeX(fTileMode); + sampler->textureParams()->setTileModeY(kClamp_TileMode); + sampler->textureParams()->setBilerp(true); return SkNEW_ARGS(GrConical2Gradient, (context, *this, sampler, diffLen, fRadius1, fRadius2 - fRadius1)); } @@ -2471,9 +2471,9 @@ public: virtual GrCustomStage* asNewCustomStage(GrContext* context, GrSamplerState* sampler) const SK_OVERRIDE { sampler->matrix()->preConcat(fPtsToUnit); - sampler->setWrapX(sk_tile_mode_to_grwrap(fTileMode)); - sampler->setWrapY(sk_tile_mode_to_grwrap(kClamp_TileMode)); - sampler->setFilter(GrSamplerState::kBilinear_Filter); + sampler->textureParams()->setTileModeX(fTileMode); + sampler->textureParams()->setTileModeY(kClamp_TileMode); + sampler->textureParams()->setBilerp(true); return SkNEW_ARGS(GrSweepGradient, (context, *this, sampler)); } |