diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-11-17 15:17:07 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-17 21:13:18 +0000 |
| commit | 514baff8be7f71111aa7bfb9b099a096b31e16ec (patch) | |
| tree | 635854f47c42f30de48e739b42eb85aba2f1efb3 /tests | |
| parent | 7776029b54cc8c21fd6e0c1aa5a3b30e8bb52939 (diff) | |
Rename GrTextureParams to GrSamplerParams
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4965
Change-Id: I7d52e81c670e92ca96117284f44b274ce3cc3671
Reviewed-on: https://skia-review.googlesource.com/4965
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/IntTextureTest.cpp | 6 | ||||
| -rw-r--r-- | tests/RectangleTextureTest.cpp | 6 | ||||
| -rw-r--r-- | tests/SRGBMipMapTest.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/tests/IntTextureTest.cpp b/tests/IntTextureTest.cpp index 15494fec13..a6eaf98aea 100644 --- a/tests/IntTextureTest.cpp +++ b/tests/IntTextureTest.cpp @@ -188,9 +188,9 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(IntTexture, reporter, ctxInfo) { sk_sp<GrRenderTargetContext> rtContext = context->makeRenderTargetContext( SkBackingFit::kExact, kS, kS, kRGBA_8888_GrPixelConfig, nullptr); - for (auto filter : {GrTextureParams::kNone_FilterMode, - GrTextureParams::kBilerp_FilterMode, - GrTextureParams::kMipMap_FilterMode}) { + for (auto filter : {GrSamplerParams::kNone_FilterMode, + GrSamplerParams::kBilerp_FilterMode, + GrSamplerParams::kMipMap_FilterMode}) { SkMatrix m; m.setIDiv(kS, kS); sk_sp<GrFragmentProcessor> fp(GrSimpleTextureEffect::Make(texture.get(), nullptr, m, diff --git a/tests/RectangleTextureTest.cpp b/tests/RectangleTextureTest.cpp index 21540d99c0..cc0c4d1e31 100644 --- a/tests/RectangleTextureTest.cpp +++ b/tests/RectangleTextureTest.cpp @@ -98,9 +98,9 @@ static void test_basic_draw(skiatest::Reporter* reporter, GrContext* context, nullptr)); SkMatrix m; m.setIDiv(rectangleTexture->width(), rectangleTexture->height()); - for (auto filter : {GrTextureParams::kNone_FilterMode, - GrTextureParams::kBilerp_FilterMode, - GrTextureParams::kMipMap_FilterMode}) { + for (auto filter : {GrSamplerParams::kNone_FilterMode, + GrSamplerParams::kBilerp_FilterMode, + GrSamplerParams::kMipMap_FilterMode}) { rtContext->clear(nullptr, 0xDDCCBBAA, true); sk_sp<GrFragmentProcessor> fp(GrSimpleTextureEffect::Make(rectangleTexture, nullptr, m, filter)); diff --git a/tests/SRGBMipMapTest.cpp b/tests/SRGBMipMapTest.cpp index 4261796001..a875c5c710 100644 --- a/tests/SRGBMipMapTest.cpp +++ b/tests/SRGBMipMapTest.cpp @@ -130,7 +130,7 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(SRGBMipMaps, reporter, ctxInfo) { GrNoClip noClip; GrPaint paint; paint.setPorterDuffXPFactory(SkBlendMode::kSrc); - GrTextureParams mipMapParams(SkShader::kRepeat_TileMode, GrTextureParams::kMipMap_FilterMode); + GrSamplerParams mipMapParams(SkShader::kRepeat_TileMode, GrSamplerParams::kMipMap_FilterMode); paint.addColorTextureProcessor(texture.get(), nullptr, SkMatrix::MakeScale(0.5f), mipMapParams); // 1) Draw texture to S32 surface (should generate/use sRGB mips) |