diff options
| author |  Greg Daniel <egdaniel@google.com> | 2017-09-25 12:27:44 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-26 18:17:37 +0000 |
| commit | e2d76d5ffea9e0fed2970d7b54d77b91d4b358de (patch) | |
| tree | 19b966ae91bbb97d97b812ae6641c3f77a7ba27a /tests | |
| parent | 9b89bcae4088b174480795ef16e321c6c74e85ae (diff) | |
Remove fIsMipMapped from GrSurfaceDesc
Part 3 of 3 for relanding of https://skia-review.googlesource.com/c/skia/+/42083
Bug: skia:
Change-Id: I98c5406015213df5d11a0101df8722da6845157e
Reviewed-on: https://skia-review.googlesource.com/44464
Reviewed-by: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/GrSurfaceTest.cpp | 3 | ||||
| -rw-r--r-- | tests/IntTextureTest.cpp | 3 | ||||
| -rw-r--r-- | tests/ResourceCacheTest.cpp | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/tests/GrSurfaceTest.cpp b/tests/GrSurfaceTest.cpp index 7ead7cd971..8f5aa55685 100644 --- a/tests/GrSurfaceTest.cpp +++ b/tests/GrSurfaceTest.cpp @@ -125,7 +125,6 @@ DEF_GPUTEST_FOR_ALL_CONTEXTS(GrSurfaceRenderability, reporter, ctxInfo) { texels[i].fPixels = pixelData.get(); texels[i].fRowBytes = rowBytes >> i; } - desc.fIsMipMapped = true; sk_sp<GrTextureProxy> proxy = GrSurfaceProxy::MakeDeferredMipMap(resourceProvider, desc, SkBudgeted::kNo, texels.get(), @@ -135,7 +134,6 @@ DEF_GPUTEST_FOR_ALL_CONTEXTS(GrSurfaceRenderability, reporter, ctxInfo) { caps->mipMapSupport() && !GrPixelConfigIsSint(desc.fConfig))); - desc.fIsMipMapped = false; desc.fFlags = kRenderTarget_GrSurfaceFlag; tex = resourceProvider->createTexture(desc, SkBudgeted::kNo); REPORTER_ASSERT(reporter, SkToBool(tex.get()) == caps->isConfigRenderable(config, false)); @@ -168,7 +166,6 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(InitialTextureClear, reporter, context_info) continue; } desc.fFlags |= rt ? kRenderTarget_GrSurfaceFlag : kNone_GrSurfaceFlags; - desc.fIsMipMapped = false; for (GrSurfaceOrigin origin : {kTopLeft_GrSurfaceOrigin, kBottomLeft_GrSurfaceOrigin}) { desc.fOrigin = origin; diff --git a/tests/IntTextureTest.cpp b/tests/IntTextureTest.cpp index 723d6b18b0..3baded97cb 100644 --- a/tests/IntTextureTest.cpp +++ b/tests/IntTextureTest.cpp @@ -66,8 +66,6 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(IntTexture, reporter, ctxInfo) { levels[1].fPixels = testData.get(); levels[1].fRowBytes = (kS / 2) * sizeof(int32_t); - desc.fIsMipMapped = true; - sk_sp<GrTextureProxy> temp(GrSurfaceProxy::MakeDeferredMipMap(context->resourceProvider(), desc, SkBudgeted::kYes, @@ -75,7 +73,6 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(IntTexture, reporter, ctxInfo) { REPORTER_ASSERT(reporter, !temp); } - desc.fIsMipMapped = false; // Test that we can create an integer texture. sk_sp<GrTextureProxy> proxy = GrSurfaceProxy::MakeDeferred(context->resourceProvider(), desc, SkBudgeted::kYes, diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp index b636b9639d..af33f2d9bc 100644 --- a/tests/ResourceCacheTest.cpp +++ b/tests/ResourceCacheTest.cpp @@ -1668,7 +1668,6 @@ static sk_sp<GrTextureProxy> make_mipmap_proxy(GrResourceProvider* provider, desc.fHeight = height; desc.fConfig = kRGBA_8888_GrPixelConfig; desc.fSampleCnt = sampleCnt; - desc.fIsMipMapped = true; return GrSurfaceProxy::MakeDeferredMipMap(provider, desc, SkBudgeted::kYes, texels.get(), mipLevelCount); |