504dd052b9
This is a reland of 01d6fc9d84
Chrome layout tests have been suppressed so this shouldn't block a Skia roll.
Original change's description:
> Go back to cleaning up MIP levels on texture export rather than assuming dirty
> on texture import.
>
> Bug: skia:8155
> Change-Id: I23399f442d52c73906829132f798eda260b6d4ae
> Reviewed-on: https://skia-review.googlesource.com/143291
> Auto-Submit: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Brian Osman <brianosman@google.com>
> Reviewed-by: Brian Osman <brianosman@google.com>
Bug: skia:8155
Change-Id: Ia3843b66c2453daf15e566b7ecf890c2ff4aed22
Reviewed-on: https://skia-review.googlesource.com/143960
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
323 lines
14 KiB
C++
323 lines
14 KiB
C++
/*
|
|
* Copyright 2017 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "SkTypes.h"
|
|
|
|
#include "GrBackendSurface.h"
|
|
#include "GrBackendTextureImageGenerator.h"
|
|
#include "GrContext.h"
|
|
#include "GrContextPriv.h"
|
|
#include "GrGpu.h"
|
|
#include "GrRenderTargetContext.h"
|
|
#include "GrSemaphore.h"
|
|
#include "GrSurfaceProxyPriv.h"
|
|
#include "GrTest.h"
|
|
#include "GrTexturePriv.h"
|
|
#include "GrTextureProxy.h"
|
|
#include "SkCanvas.h"
|
|
#include "SkImage_Base.h"
|
|
#include "SkGpuDevice.h"
|
|
#include "SkPoint.h"
|
|
#include "SkSurface.h"
|
|
#include "SkSurface_Gpu.h"
|
|
#include "Test.h"
|
|
|
|
static constexpr int kSize = 8;
|
|
|
|
// Test that the correct mip map states are on the GrTextures when wrapping GrBackendTextures in
|
|
// SkImages and SkSurfaces
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrWrappedMipMappedTest, reporter, ctxInfo) {
|
|
GrContext* context = ctxInfo.grContext();
|
|
if (!context->contextPriv().caps()->mipMapSupport()) {
|
|
return;
|
|
}
|
|
GrGpu* gpu = context->contextPriv().getGpu();
|
|
|
|
for (auto mipMapped : {GrMipMapped::kNo, GrMipMapped::kYes}) {
|
|
for (auto isRT : {false, true}) {
|
|
// CreateTestingOnlyBackendTexture currently doesn't support uploading data to mip maps
|
|
// so we don't send any. However, we pretend there is data for the checks below which is
|
|
// fine since we are never actually using these textures for any work on the gpu.
|
|
GrBackendTexture backendTex = gpu->createTestingOnlyBackendTexture(
|
|
nullptr, kSize, kSize, kRGBA_8888_GrPixelConfig, isRT, mipMapped);
|
|
|
|
sk_sp<GrTextureProxy> proxy;
|
|
sk_sp<SkImage> image;
|
|
if (isRT) {
|
|
sk_sp<SkSurface> surface = SkSurface::MakeFromBackendTexture(
|
|
context,
|
|
backendTex,
|
|
kTopLeft_GrSurfaceOrigin,
|
|
0,
|
|
kRGBA_8888_SkColorType,
|
|
nullptr,
|
|
nullptr);
|
|
|
|
SkGpuDevice* device = ((SkSurface_Gpu*)surface.get())->getDevice();
|
|
proxy = device->accessRenderTargetContext()->asTextureProxyRef();
|
|
} else {
|
|
image = SkImage::MakeFromTexture(context, backendTex,
|
|
kTopLeft_GrSurfaceOrigin,
|
|
kRGBA_8888_SkColorType,
|
|
kPremul_SkAlphaType, nullptr,
|
|
nullptr, nullptr);
|
|
proxy = as_IB(image)->asTextureProxyRef();
|
|
}
|
|
REPORTER_ASSERT(reporter, proxy);
|
|
if (!proxy) {
|
|
gpu->deleteTestingOnlyBackendTexture(backendTex);
|
|
return;
|
|
}
|
|
|
|
REPORTER_ASSERT(reporter, proxy->priv().isInstantiated());
|
|
|
|
GrTexture* texture = proxy->priv().peekTexture();
|
|
REPORTER_ASSERT(reporter, texture);
|
|
if (!texture) {
|
|
gpu->deleteTestingOnlyBackendTexture(backendTex);
|
|
return;
|
|
}
|
|
|
|
if (GrMipMapped::kYes == mipMapped) {
|
|
REPORTER_ASSERT(reporter, GrMipMapped::kYes == texture->texturePriv().mipMapped());
|
|
if (isRT) {
|
|
REPORTER_ASSERT(reporter, texture->texturePriv().mipMapsAreDirty());
|
|
} else {
|
|
REPORTER_ASSERT(reporter, !texture->texturePriv().mipMapsAreDirty());
|
|
}
|
|
} else {
|
|
REPORTER_ASSERT(reporter, GrMipMapped::kNo == texture->texturePriv().mipMapped());
|
|
}
|
|
gpu->deleteTestingOnlyBackendTexture(backendTex);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Test that we correctly copy or don't copy GrBackendTextures in the GrBackendTextureImageGenerator
|
|
// based on if we will use mips in the draw and the mip status of the GrBackendTexture.
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrBackendTextureImageMipMappedTest, reporter, ctxInfo) {
|
|
GrContext* context = ctxInfo.grContext();
|
|
if (!context->contextPriv().caps()->mipMapSupport()) {
|
|
return;
|
|
}
|
|
GrGpu* gpu = context->contextPriv().getGpu();
|
|
|
|
for (auto mipMapped : {GrMipMapped::kNo, GrMipMapped::kYes}) {
|
|
for (auto willUseMips : {false, true}) {
|
|
GrBackendTexture backendTex = gpu->createTestingOnlyBackendTexture(
|
|
nullptr, kSize, kSize, kRGBA_8888_GrPixelConfig, false, mipMapped);
|
|
|
|
sk_sp<SkImage> image = SkImage::MakeFromTexture(context, backendTex,
|
|
kTopLeft_GrSurfaceOrigin,
|
|
kRGBA_8888_SkColorType,
|
|
kPremul_SkAlphaType, nullptr,
|
|
nullptr, nullptr);
|
|
|
|
GrTextureProxy* proxy = as_IB(image)->peekProxy();
|
|
REPORTER_ASSERT(reporter, proxy);
|
|
if (!proxy) {
|
|
gpu->deleteTestingOnlyBackendTexture(backendTex);
|
|
return;
|
|
}
|
|
|
|
REPORTER_ASSERT(reporter, proxy->priv().isInstantiated());
|
|
|
|
sk_sp<GrTexture> texture = sk_ref_sp(proxy->priv().peekTexture());
|
|
REPORTER_ASSERT(reporter, texture);
|
|
if (!texture) {
|
|
gpu->deleteTestingOnlyBackendTexture(backendTex);
|
|
return;
|
|
}
|
|
|
|
std::unique_ptr<SkImageGenerator> imageGen = GrBackendTextureImageGenerator::Make(
|
|
texture, kTopLeft_GrSurfaceOrigin, nullptr, kRGBA_8888_SkColorType,
|
|
kPremul_SkAlphaType, nullptr);
|
|
REPORTER_ASSERT(reporter, imageGen);
|
|
if (!imageGen) {
|
|
gpu->deleteTestingOnlyBackendTexture(backendTex);
|
|
return;
|
|
}
|
|
|
|
SkIPoint origin = SkIPoint::Make(0,0);
|
|
SkImageInfo imageInfo = SkImageInfo::Make(kSize, kSize, kRGBA_8888_SkColorType,
|
|
kPremul_SkAlphaType);
|
|
sk_sp<GrTextureProxy> genProxy = imageGen->generateTexture(context, imageInfo,
|
|
origin, willUseMips);
|
|
|
|
REPORTER_ASSERT(reporter, genProxy);
|
|
if (!genProxy) {
|
|
gpu->deleteTestingOnlyBackendTexture(backendTex);
|
|
return;
|
|
}
|
|
|
|
if (GrSurfaceProxy::LazyState::kNot != genProxy->lazyInstantiationState()) {
|
|
genProxy->priv().doLazyInstantiation(context->contextPriv().resourceProvider());
|
|
} else if (!genProxy->priv().isInstantiated()) {
|
|
genProxy->instantiate(context->contextPriv().resourceProvider());
|
|
}
|
|
|
|
REPORTER_ASSERT(reporter, genProxy->priv().isInstantiated());
|
|
if (!genProxy->priv().isInstantiated()) {
|
|
gpu->deleteTestingOnlyBackendTexture(backendTex);
|
|
return;
|
|
}
|
|
|
|
GrTexture* genTexture = genProxy->priv().peekTexture();
|
|
REPORTER_ASSERT(reporter, genTexture);
|
|
if (!genTexture) {
|
|
gpu->deleteTestingOnlyBackendTexture(backendTex);
|
|
return;
|
|
}
|
|
|
|
GrBackendTexture genBackendTex = genTexture->getBackendTexture();
|
|
|
|
if (kOpenGL_GrBackend == genBackendTex.backend()) {
|
|
GrGLTextureInfo genTexInfo;
|
|
GrGLTextureInfo origTexInfo;
|
|
if (genBackendTex.getGLTextureInfo(&genTexInfo) &&
|
|
backendTex.getGLTextureInfo(&origTexInfo)) {
|
|
if (willUseMips && GrMipMapped::kNo == mipMapped) {
|
|
// We did a copy so the texture IDs should be different
|
|
REPORTER_ASSERT(reporter, origTexInfo.fID != genTexInfo.fID);
|
|
} else {
|
|
REPORTER_ASSERT(reporter, origTexInfo.fID == genTexInfo.fID);
|
|
}
|
|
} else {
|
|
ERRORF(reporter, "Failed to get GrGLTextureInfo");
|
|
}
|
|
#ifdef SK_VULKAN
|
|
} else if (kVulkan_GrBackend == genBackendTex.backend()) {
|
|
GrVkImageInfo genImageInfo;
|
|
GrVkImageInfo origImageInfo;
|
|
if (genBackendTex.getVkImageInfo(&genImageInfo) &&
|
|
backendTex.getVkImageInfo(&origImageInfo)) {
|
|
if (willUseMips && GrMipMapped::kNo == mipMapped) {
|
|
// We did a copy so the texture IDs should be different
|
|
REPORTER_ASSERT(reporter, origImageInfo.fImage != genImageInfo.fImage);
|
|
} else {
|
|
REPORTER_ASSERT(reporter, origImageInfo.fImage == genImageInfo.fImage);
|
|
}
|
|
} else {
|
|
ERRORF(reporter, "Failed to get GrVkImageInfo");
|
|
}
|
|
#endif
|
|
} else {
|
|
REPORTER_ASSERT(reporter, false);
|
|
}
|
|
|
|
// Must make sure the uses of the backend texture have finished (we possibly have a
|
|
// queued up copy) before we delete the backend texture.
|
|
context->flush();
|
|
gpu->testingOnly_flushGpuAndSync();
|
|
|
|
gpu->deleteTestingOnlyBackendTexture(backendTex);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Test that when we call makeImageSnapshot on an SkSurface we retains the same mip status as the
|
|
// resource we took the snapshot of.
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrImageSnapshotMipMappedTest, reporter, ctxInfo) {
|
|
GrContext* context = ctxInfo.grContext();
|
|
if (!context->contextPriv().caps()->mipMapSupport()) {
|
|
return;
|
|
}
|
|
|
|
auto resourceProvider = context->contextPriv().resourceProvider();
|
|
GrGpu* gpu = context->contextPriv().getGpu();
|
|
|
|
for (auto willUseMips : {false, true}) {
|
|
for (auto isWrapped : {false, true}) {
|
|
GrMipMapped mipMapped = willUseMips ? GrMipMapped::kYes : GrMipMapped::kNo;
|
|
sk_sp<SkSurface> surface;
|
|
GrBackendTexture backendTex = gpu->createTestingOnlyBackendTexture(
|
|
nullptr, kSize, kSize, kRGBA_8888_GrPixelConfig, true, mipMapped);
|
|
if (isWrapped) {
|
|
surface = SkSurface::MakeFromBackendTexture(context,
|
|
backendTex,
|
|
kTopLeft_GrSurfaceOrigin,
|
|
0,
|
|
kRGBA_8888_SkColorType,
|
|
nullptr,
|
|
nullptr);
|
|
} else {
|
|
SkImageInfo info = SkImageInfo::Make(kSize, kSize, kRGBA_8888_SkColorType,
|
|
kPremul_SkAlphaType);
|
|
surface = SkSurface::MakeRenderTarget(context, SkBudgeted::kYes, info, 0,
|
|
kTopLeft_GrSurfaceOrigin, nullptr,
|
|
willUseMips);
|
|
}
|
|
REPORTER_ASSERT(reporter, surface);
|
|
if (!surface) {
|
|
gpu->deleteTestingOnlyBackendTexture(backendTex);
|
|
}
|
|
SkGpuDevice* device = ((SkSurface_Gpu*)surface.get())->getDevice();
|
|
GrTextureProxy* texProxy = device->accessRenderTargetContext()->asTextureProxy();
|
|
REPORTER_ASSERT(reporter, mipMapped == texProxy->mipMapped());
|
|
|
|
texProxy->instantiate(resourceProvider);
|
|
GrTexture* texture = texProxy->priv().peekTexture();
|
|
REPORTER_ASSERT(reporter, mipMapped == texture->texturePriv().mipMapped());
|
|
|
|
sk_sp<SkImage> image = surface->makeImageSnapshot();
|
|
REPORTER_ASSERT(reporter, image);
|
|
if (!image) {
|
|
gpu->deleteTestingOnlyBackendTexture(backendTex);
|
|
}
|
|
texProxy = as_IB(image)->peekProxy();
|
|
REPORTER_ASSERT(reporter, mipMapped == texProxy->mipMapped());
|
|
|
|
texProxy->instantiate(resourceProvider);
|
|
texture = texProxy->priv().peekTexture();
|
|
REPORTER_ASSERT(reporter, mipMapped == texture->texturePriv().mipMapped());
|
|
|
|
// Must flush the context to make sure all the cmds (copies, etc.) from above are sent
|
|
// to the gpu before we delete the backendHandle.
|
|
context->flush();
|
|
gpu->testingOnly_flushGpuAndSync();
|
|
gpu->deleteTestingOnlyBackendTexture(backendTex);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Test that we don't create a mip mapped texture if the size is 1x1 even if the filter mode is set
|
|
// to use mips. This test passes by not crashing or hitting asserts in code.
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(Gr1x1TextureMipMappedTest, reporter, ctxInfo) {
|
|
GrContext* context = ctxInfo.grContext();
|
|
if (!context->contextPriv().caps()->mipMapSupport()) {
|
|
return;
|
|
}
|
|
|
|
// Make surface to draw into
|
|
SkImageInfo info = SkImageInfo::MakeN32(16, 16, kPremul_SkAlphaType);
|
|
sk_sp<SkSurface> surface = SkSurface::MakeRenderTarget(context, SkBudgeted::kNo, info);
|
|
|
|
// Make 1x1 raster bitmap
|
|
SkBitmap bmp;
|
|
bmp.allocN32Pixels(1, 1);
|
|
SkPMColor* pixel = reinterpret_cast<SkPMColor*>(bmp.getPixels());
|
|
*pixel = 0;
|
|
|
|
sk_sp<SkImage> bmpImage = SkImage::MakeFromBitmap(bmp);
|
|
|
|
// Make sure we scale so we don't optimize out the use of mips.
|
|
surface->getCanvas()->scale(0.5f, 0.5f);
|
|
|
|
SkPaint paint;
|
|
// This should upload the image to a non mipped GrTextureProxy.
|
|
surface->getCanvas()->drawImage(bmpImage, 0, 0, &paint);
|
|
surface->flush();
|
|
|
|
// Now set the filter quality to high so we use mip maps. We should find the non mipped texture
|
|
// in the cache for the SkImage. Since the texture is 1x1 we should just use that texture
|
|
// instead of trying to do a copy to a mipped texture.
|
|
paint.setFilterQuality(kHigh_SkFilterQuality);
|
|
surface->getCanvas()->drawImage(bmpImage, 0, 0, &paint);
|
|
surface->flush();
|
|
}
|
|
|