diff options
author | Greg Daniel <egdaniel@google.com> | 2018-06-08 13:02:22 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-08 17:39:33 +0000 |
commit | 9eb36b9eb8e81e970e02fa985ae82fe64de0a8f0 (patch) | |
tree | d1559a2b142f2cc1e07498a1320d7be9c1961042 /tests | |
parent | fff19667cc5c0157335144bee69418d56a4fad4b (diff) |
Reland "Require mips to be allocated at texture creation time and disable late allocations."
This reverts commit 0c78238e2991c95b6fb3c945d4ad2b5d941ae21b.
Reason for revert: <INSERT REASONING HERE>
Original change's description:
> Revert "Require mips to be allocated at texture creation time and disable late allocations."
>
> This reverts commit cd2c3f9055452d413d6be7ea6dc63fd1922fe994.
>
> Reason for revert: Looks to be causing angle failures on initial clear test
>
> Original change's description:
> > Require mips to be allocated at texture creation time and disable late allocations.
> >
> > If we get a non-mipped texture for a draw that wants to be use mip map filter, we
> > will copy the texture into a new mipped texture.
> >
> > Clean up of unused code in the GPU backends for reallocating for mips will be done
> > in a follow up CL.
> >
> > Bug: skia:
> > Change-Id: Idab588c1abf4bbbf7eeceb3727d500e5df274188
> > Reviewed-on: https://skia-review.googlesource.com/132830
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
> > Commit-Queue: Greg Daniel <egdaniel@google.com>
>
>
>
> Change-Id: I49f0ace52f2586d61b451630b2e6aae84b420b81
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/133041
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>
Bug: skia:
Change-Id: I004447a5f1ec72c3be2318ddea803f57efb12ea4
Reviewed-on: https://skia-review.googlesource.com/133340
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/DeferredDisplayListTest.cpp | 41 | ||||
-rw-r--r-- | tests/EGLImageTest.cpp | 6 | ||||
-rw-r--r-- | tests/GLProgramsTest.cpp | 6 | ||||
-rw-r--r-- | tests/GrTextureMipMapInvalidationTest.cpp | 50 | ||||
-rw-r--r-- | tests/LazyProxyTest.cpp | 4 | ||||
-rw-r--r-- | tests/RectangleTextureTest.cpp | 5 |
6 files changed, 61 insertions, 51 deletions
diff --git a/tests/DeferredDisplayListTest.cpp b/tests/DeferredDisplayListTest.cpp index 996e04fa79..697f00328f 100644 --- a/tests/DeferredDisplayListTest.cpp +++ b/tests/DeferredDisplayListTest.cpp @@ -846,26 +846,31 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(DDLTextureFlagsTest, reporter, ctxInfo) { SkDeferredDisplayListRecorder recorder(characterization); for (GrGLenum target : { GR_GL_TEXTURE_EXTERNAL, GR_GL_TEXTURE_RECTANGLE, GR_GL_TEXTURE_2D } ) { - GrBackendFormat format = GrBackendFormat::MakeGL(GR_GL_RGBA8, target); - - sk_sp<SkImage> image = recorder.makePromiseTexture(format, 32, 32, GrMipMapped::kYes, - kTopLeft_GrSurfaceOrigin, - kRGBA_8888_SkColorType, - kPremul_SkAlphaType, nullptr, - dummy_fulfill_proc, - dummy_release_proc, - dummy_done_proc, - nullptr); - REPORTER_ASSERT(reporter, image); + for (auto mipMapped : { GrMipMapped::kNo, GrMipMapped::kYes }) { + GrBackendFormat format = GrBackendFormat::MakeGL(GR_GL_RGBA8, target); + + sk_sp<SkImage> image = recorder.makePromiseTexture(format, 32, 32, mipMapped, + kTopLeft_GrSurfaceOrigin, + kRGBA_8888_SkColorType, + kPremul_SkAlphaType, nullptr, + dummy_fulfill_proc, + dummy_release_proc, + dummy_done_proc, + nullptr); + if (GR_GL_TEXTURE_2D != target && mipMapped == GrMipMapped::kYes) { + REPORTER_ASSERT(reporter, !image); + continue; + } + REPORTER_ASSERT(reporter, image); - GrTextureProxy* backingProxy = ((SkImage_Gpu*) image.get())->peekProxy(); + GrTextureProxy* backingProxy = ((SkImage_Gpu*) image.get())->peekProxy(); - if (GR_GL_TEXTURE_2D == target) { - REPORTER_ASSERT(reporter, !backingProxy->texPriv().doesNotSupportMipMaps()); - REPORTER_ASSERT(reporter, !backingProxy->texPriv().isClampOnly()); - } else { - REPORTER_ASSERT(reporter, backingProxy->texPriv().doesNotSupportMipMaps()); - REPORTER_ASSERT(reporter, backingProxy->texPriv().isClampOnly()); + REPORTER_ASSERT(reporter, backingProxy->mipMapped() == mipMapped); + if (GR_GL_TEXTURE_2D == target) { + REPORTER_ASSERT(reporter, !backingProxy->texPriv().isClampOnly()); + } else { + REPORTER_ASSERT(reporter, backingProxy->texPriv().isClampOnly()); + } } } } diff --git a/tests/EGLImageTest.cpp b/tests/EGLImageTest.cpp index f2c73711e7..94cbaf9c17 100644 --- a/tests/EGLImageTest.cpp +++ b/tests/EGLImageTest.cpp @@ -16,6 +16,7 @@ #include "GrTest.h" #include "GrTexture.h" #include "GrTextureContext.h" +#include "GrTexturePriv.h" #include "GrTextureProxyPriv.h" #include "gl/GLTestContext.h" #include "gl/GrGLGpu.h" @@ -166,8 +167,9 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(EGLImageTest, reporter, ctxInfo) { } GrTextureProxy* proxy = surfaceContext->asTextureProxy(); - REPORTER_ASSERT(reporter, proxy->texPriv().doesNotSupportMipMaps()); - REPORTER_ASSERT(reporter, proxy->priv().peekTexture()->surfacePriv().doesNotSupportMipMaps()); + REPORTER_ASSERT(reporter, proxy->mipMapped() == GrMipMapped::kNo); + REPORTER_ASSERT(reporter, + proxy->priv().peekTexture()->texturePriv().mipMapped() == GrMipMapped::kNo); REPORTER_ASSERT(reporter, proxy->texPriv().isGLTextureRectangleOrExternal()); REPORTER_ASSERT(reporter, diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp index 81fb21fa32..359527fce5 100644 --- a/tests/GLProgramsTest.cpp +++ b/tests/GLProgramsTest.cpp @@ -273,7 +273,8 @@ bool GrDrawingManager::ProgramUnitTest(GrContext* context, int maxStages, int ma dummyDesc.fHeight = 18; dummyDesc.fConfig = kRGBA_8888_GrPixelConfig; proxies[0] = proxyProvider->createProxy(dummyDesc, kBottomLeft_GrSurfaceOrigin, - SkBackingFit::kExact, SkBudgeted::kNo); + GrMipMapped::kYes, SkBackingFit::kExact, + SkBudgeted::kNo, GrInternalSurfaceFlags::kNone); } { GrSurfaceDesc dummyDesc; @@ -282,7 +283,8 @@ bool GrDrawingManager::ProgramUnitTest(GrContext* context, int maxStages, int ma dummyDesc.fHeight = 22; dummyDesc.fConfig = kAlpha_8_GrPixelConfig; proxies[1] = proxyProvider->createProxy(dummyDesc, kTopLeft_GrSurfaceOrigin, - SkBackingFit::kExact, SkBudgeted::kNo); + GrMipMapped::kYes, SkBackingFit::kExact, + SkBudgeted::kNo, GrInternalSurfaceFlags::kNone); } if (!proxies[0] || !proxies[1]) { diff --git a/tests/GrTextureMipMapInvalidationTest.cpp b/tests/GrTextureMipMapInvalidationTest.cpp index d832889144..8da79c9565 100644 --- a/tests/GrTextureMipMapInvalidationTest.cpp +++ b/tests/GrTextureMipMapInvalidationTest.cpp @@ -27,27 +27,31 @@ DEF_GPUTEST_FOR_NULLGL_CONTEXT(GrTextureMipMapInvalidationTest, reporter, ctxInf GrContext* context = ctxInfo.grContext(); auto info = SkImageInfo::MakeN32Premul(256, 256); - auto surf1 = SkSurface::MakeRenderTarget(context, SkBudgeted::kYes, info); - auto surf2 = SkSurface::MakeRenderTarget(context, SkBudgeted::kYes, info); - // Draw something just in case we ever had a solid color optimization - surf1->getCanvas()->drawCircle(128, 128, 50, SkPaint()); - surf1->getCanvas()->flush(); - - // No mipmaps initially - REPORTER_ASSERT(reporter, !isMipped(surf1.get())); - - // Painting with downscale and medium filter quality should result in mipmap creation - SkPaint paint; - paint.setFilterQuality(kMedium_SkFilterQuality); - surf2->getCanvas()->scale(0.2f, 0.2f); - surf2->getCanvas()->drawImage(surf1->makeImageSnapshot(), 0, 0, &paint); - surf2->getCanvas()->flush(); - REPORTER_ASSERT(reporter, isMipped(surf1.get())); - REPORTER_ASSERT(reporter, !mipsAreDirty(surf1.get())); - - // Changing the contents of the surface should invalidate the mipmap, but not de-allocate - surf1->getCanvas()->drawCircle(128, 128, 100, SkPaint()); - surf1->getCanvas()->flush(); - REPORTER_ASSERT(reporter, isMipped(surf1.get())); - REPORTER_ASSERT(reporter, mipsAreDirty(surf1.get())); + for (auto allocateMips : {false, true}) { + auto surf1 = SkSurface::MakeRenderTarget(context, SkBudgeted::kYes, info, 0, + kBottomLeft_GrSurfaceOrigin, nullptr, + allocateMips); + auto surf2 = SkSurface::MakeRenderTarget(context, SkBudgeted::kYes, info); + // Draw something just in case we ever had a solid color optimization + surf1->getCanvas()->drawCircle(128, 128, 50, SkPaint()); + surf1->getCanvas()->flush(); + + // No mipmaps initially + REPORTER_ASSERT(reporter, isMipped(surf1.get()) == allocateMips); + + // Painting with downscale and medium filter quality should result in mipmap creation + SkPaint paint; + paint.setFilterQuality(kMedium_SkFilterQuality); + surf2->getCanvas()->scale(0.2f, 0.2f); + surf2->getCanvas()->drawImage(surf1->makeImageSnapshot(), 0, 0, &paint); + surf2->getCanvas()->flush(); + REPORTER_ASSERT(reporter, isMipped(surf1.get()) == allocateMips); + REPORTER_ASSERT(reporter, !allocateMips || !mipsAreDirty(surf1.get())); + + // Changing the contents of the surface should invalidate the mipmap, but not de-allocate + surf1->getCanvas()->drawCircle(128, 128, 100, SkPaint()); + surf1->getCanvas()->flush(); + REPORTER_ASSERT(reporter, isMipped(surf1.get()) == allocateMips); + REPORTER_ASSERT(reporter, mipsAreDirty(surf1.get())); + } } diff --git a/tests/LazyProxyTest.cpp b/tests/LazyProxyTest.cpp index 901cd29895..536ef36307 100644 --- a/tests/LazyProxyTest.cpp +++ b/tests/LazyProxyTest.cpp @@ -443,10 +443,6 @@ DEF_GPUTEST(LazyProxyUninstantiateTest, reporter, /* options */) { REPORTER_ASSERT(reporter, lazyProxy.get()); - // We can't pass the fact that this creates a wrapped texture into createLazyProxy so we - // need to manually call setDoesNotSupportMipMaps. - lazyProxy->texPriv().setDoesNotSupportMipMaps(); - rtc->priv().testingOnly_addDrawOp(LazyUninstantiateTestOp::Make(ctx.get(), lazyProxy)); ctx->flush(); diff --git a/tests/RectangleTextureTest.cpp b/tests/RectangleTextureTest.cpp index 3516acf339..90b723a3eb 100644 --- a/tests/RectangleTextureTest.cpp +++ b/tests/RectangleTextureTest.cpp @@ -15,6 +15,7 @@ #include "GrRenderTargetContext.h" #include "GrSurfacePriv.h" #include "GrTest.h" +#include "GrTexturePriv.h" #include "GrTextureProxyPriv.h" #include "gl/GLTestContext.h" #include "gl/GrGLGpu.h" @@ -136,8 +137,8 @@ DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(RectangleTexture, reporter, ctxInfo) { continue; } - SkASSERT(rectProxy->texPriv().doesNotSupportMipMaps()); - SkASSERT(rectProxy->priv().peekTexture()->surfacePriv().doesNotSupportMipMaps()); + SkASSERT(rectProxy->mipMapped() == GrMipMapped::kNo); + SkASSERT(rectProxy->priv().peekTexture()->texturePriv().mipMapped() == GrMipMapped::kNo); SkASSERT(rectProxy->texPriv().isGLTextureRectangleOrExternal()); SkASSERT(rectProxy->priv().peekTexture()->surfacePriv().isGLTextureRectangleOrExternal()); |