7080a431a7
This reverts commit95edb43251
. Reason for revert: breaking Ubuntu Linux GMs Original change's description: > Revert "Revert "When creating emptyp MipMap proxies, don't instantiate them immediately."" > > This reverts commit0ee866dac7
. > > Reason for revert: <INSERT REASONING HERE> > > Original change's description: > > Revert "When creating emptyp MipMap proxies, don't instantiate them immediately." > > > > This reverts commit8242c5c199
. > > > > Reason for revert: Hitting assert on intel bots on skbug6850overlay2.skp, SkASSERT(proxy->getUniqueKey().isValid()); in processInvalidProxyUniqueKey > > > > Original change's description: > > > When creating emptyp MipMap proxies, don't instantiate them immediately. > > > > > > This chnages makes it match how we handle non mipped proxies where we > > > don't actually instantiate them until we need to. > > > > > > Bug: skia: > > > Change-Id: Id0c50eefce43ef1458a3ff0bb1881a817b045279 > > > Reviewed-on: https://skia-review.googlesource.com/106966 > > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > > Reviewed-by: Robert Phillips <robertphillips@google.com> > > > > TBR=egdaniel@google.com,robertphillips@google.com > > > > Change-Id: I1fa6165b69c5bbb1d6bb10abba33dcdb55a27ba3 > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Bug: skia: > > Reviewed-on: https://skia-review.googlesource.com/107263 > > Reviewed-by: Greg Daniel <egdaniel@google.com> > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > TBR=egdaniel@google.com,robertphillips@google.com > > Bug: skia: > Change-Id: Ice34283f9ac183faed6e061d8162cf2226b18289 > Reviewed-on: https://skia-review.googlesource.com/107320 > Reviewed-by: Robert Phillips <robertphillips@google.com> > Commit-Queue: Greg Daniel <egdaniel@google.com> TBR=egdaniel@google.com,robertphillips@google.com Change-Id: I53f166d508cc8ccd71e7473934a12a52f2eba7bb No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/107321 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
283 lines
13 KiB
C++
283 lines
13 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"
|
|
|
|
#if SK_SUPPORT_GPU
|
|
|
|
#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->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->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, kPremul_SkAlphaType, nullptr);
|
|
REPORTER_ASSERT(reporter, imageGen);
|
|
if (!imageGen) {
|
|
gpu->deleteTestingOnlyBackendTexture(&backendTex);
|
|
return;
|
|
}
|
|
|
|
SkIPoint origin = SkIPoint::Make(0,0);
|
|
// The transfer function behavior isn't used in the generator so set we set it
|
|
// arbitrarily here.
|
|
SkTransferFunctionBehavior behavior = SkTransferFunctionBehavior::kIgnore;
|
|
SkImageInfo imageInfo = SkImageInfo::Make(kSize, kSize, kRGBA_8888_SkColorType,
|
|
kPremul_SkAlphaType);
|
|
sk_sp<GrTextureProxy> genProxy = imageGen->generateTexture(context, imageInfo,
|
|
origin, behavior,
|
|
willUseMips);
|
|
|
|
REPORTER_ASSERT(reporter, genProxy);
|
|
if (!genProxy) {
|
|
gpu->deleteTestingOnlyBackendTexture(&backendTex);
|
|
return;
|
|
}
|
|
|
|
if (GrSurfaceProxy::LazyState::kNot != genProxy->lazyInstantiationState()) {
|
|
genProxy->priv().doLazyInstantiation(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 (const GrGLTextureInfo* genTexInfo = genBackendTex.getGLTextureInfo()) {
|
|
const GrGLTextureInfo* origTexInfo = backendTex.getGLTextureInfo();
|
|
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);
|
|
}
|
|
#ifdef SK_VULKAN
|
|
} else if (const GrVkImageInfo* genImageInfo = genBackendTex.getVkImageInfo()) {
|
|
const GrVkImageInfo* origImageInfo = backendTex.getVkImageInfo();
|
|
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);
|
|
}
|
|
#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. Thus we use readPixels here
|
|
// just to force the synchronization.
|
|
sk_sp<GrSurfaceContext> surfContext =
|
|
context->contextPriv().makeWrappedSurfaceContext(genProxy);
|
|
|
|
SkBitmap bitmap;
|
|
bitmap.allocPixels(imageInfo);
|
|
surfContext->readPixels(imageInfo, bitmap.getPixels(), 0, 0, 0, 0);
|
|
|
|
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->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->deleteTestingOnlyBackendTexture(&backendTex);
|
|
}
|
|
}
|
|
}
|
|
|
|
#endif
|