8385a8a44b
This reverts commit88fdee9bde
. Reason for revert: Pre Fixes landed in other repos Original change's description: > Revert "Fixes to alignment issues with regards to mapped vulkan memory." > > This reverts commit9fb6cf4c49
. > > Reason for revert: breaks fuchsia > > Original change's description: > > Fixes to alignment issues with regards to mapped vulkan memory. > > > > Bug: skia: > > Change-Id: Ida9813fe774580a6d157b8eb8d330488c8e8c4bc > > Reviewed-on: https://skia-review.googlesource.com/109483 > > Commit-Queue: Greg Daniel <egdaniel@google.com> > > Reviewed-by: Jim Van Verth <jvanverth@google.com> > > TBR=djsollen@google.com,egdaniel@google.com,jvanverth@google.com > > # Not skipping CQ checks because original CL landed > 1 day ago. > > Bug: skia: > Change-Id: If1223313cab27737ada401d1f3fe4b7ab849d03f > Reviewed-on: https://skia-review.googlesource.com/110040 > Reviewed-by: Greg Daniel <egdaniel@google.com> > Commit-Queue: Greg Daniel <egdaniel@google.com> Bug: skia: Change-Id: Ifeebf535c3617674846f7ef25e686ee11ceee65c Reviewed-on: https://skia-review.googlesource.com/110160 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
167 lines
6.0 KiB
C++
167 lines
6.0 KiB
C++
/*
|
|
* Copyright 2016 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
// This is a GPU-backend specific test. It relies on static intializers to work
|
|
|
|
#include "SkTypes.h"
|
|
|
|
#if SK_SUPPORT_GPU && defined(SK_VULKAN)
|
|
|
|
#include "GrContextPriv.h"
|
|
#include "GrContextFactory.h"
|
|
#include "GrRenderTarget.h"
|
|
#include "GrTest.h"
|
|
#include "GrTexture.h"
|
|
|
|
#include "Test.h"
|
|
#include "vk/GrVkCaps.h"
|
|
#include "vk/GrVkGpu.h"
|
|
#include "vk/GrVkMemory.h"
|
|
#include "vk/GrVkTypes.h"
|
|
|
|
using sk_gpu_test::GrContextFactory;
|
|
|
|
const int kW = 1024;
|
|
const int kH = 1024;
|
|
const GrPixelConfig kPixelConfig = kRGBA_8888_GrPixelConfig;
|
|
|
|
void wrap_tex_test(skiatest::Reporter* reporter, GrContext* context) {
|
|
|
|
GrVkGpu* gpu = static_cast<GrVkGpu*>(context->contextPriv().getGpu());
|
|
|
|
GrBackendTexture origBackendTex = gpu->createTestingOnlyBackendTexture(nullptr, kW, kH,
|
|
kPixelConfig, false,
|
|
GrMipMapped::kNo);
|
|
const GrVkImageInfo* imageInfo = origBackendTex.getVkImageInfo();
|
|
|
|
sk_sp<GrTexture> tex = gpu->wrapBackendTexture(origBackendTex, kBorrow_GrWrapOwnership);
|
|
REPORTER_ASSERT(reporter, tex);
|
|
|
|
// image is null
|
|
{
|
|
GrVkImageInfo backendCopy = *imageInfo;
|
|
backendCopy.fImage = VK_NULL_HANDLE;
|
|
GrBackendTexture backendTex = GrBackendTexture(kW, kH, backendCopy);
|
|
tex = gpu->wrapBackendTexture(backendTex, kBorrow_GrWrapOwnership);
|
|
REPORTER_ASSERT(reporter, !tex);
|
|
tex = gpu->wrapBackendTexture(backendTex, kAdopt_GrWrapOwnership);
|
|
REPORTER_ASSERT(reporter, !tex);
|
|
}
|
|
|
|
// alloc is null
|
|
{
|
|
GrVkImageInfo backendCopy = *imageInfo;
|
|
backendCopy.fAlloc = GrVkAlloc();
|
|
GrBackendTexture backendTex = GrBackendTexture(kW, kH, backendCopy);
|
|
tex = gpu->wrapBackendTexture(backendTex, kBorrow_GrWrapOwnership);
|
|
REPORTER_ASSERT(reporter, !tex);
|
|
tex = gpu->wrapBackendTexture(backendTex, kAdopt_GrWrapOwnership);
|
|
REPORTER_ASSERT(reporter, !tex);
|
|
}
|
|
|
|
// check adopt creation
|
|
{
|
|
GrVkImageInfo backendCopy = *imageInfo;
|
|
GrBackendTexture backendTex = GrBackendTexture(kW, kH, backendCopy);
|
|
tex = gpu->wrapBackendTexture(backendTex, kAdopt_GrWrapOwnership);
|
|
|
|
REPORTER_ASSERT(reporter, tex);
|
|
}
|
|
|
|
gpu->deleteTestingOnlyBackendTexture(&origBackendTex, true);
|
|
}
|
|
|
|
void wrap_rt_test(skiatest::Reporter* reporter, GrContext* context) {
|
|
GrVkGpu* gpu = static_cast<GrVkGpu*>(context->contextPriv().getGpu());
|
|
|
|
GrBackendTexture origBackendTex = gpu->createTestingOnlyBackendTexture(nullptr, kW, kH,
|
|
kPixelConfig, true,
|
|
GrMipMapped::kNo);
|
|
const GrVkImageInfo* imageInfo = origBackendTex.getVkImageInfo();
|
|
|
|
GrBackendRenderTarget origBackendRT(kW, kH, 1, 0, *imageInfo);
|
|
|
|
sk_sp<GrRenderTarget> rt = gpu->wrapBackendRenderTarget(origBackendRT);
|
|
REPORTER_ASSERT(reporter, rt);
|
|
|
|
// image is null
|
|
{
|
|
GrVkImageInfo backendCopy = *imageInfo;
|
|
backendCopy.fImage = VK_NULL_HANDLE;
|
|
GrBackendRenderTarget backendRT(kW, kH, 1, 0, backendCopy);
|
|
rt = gpu->wrapBackendRenderTarget(backendRT);
|
|
REPORTER_ASSERT(reporter, !rt);
|
|
}
|
|
|
|
// alloc is null
|
|
{
|
|
GrVkImageInfo backendCopy = *imageInfo;
|
|
backendCopy.fAlloc = GrVkAlloc();
|
|
// can wrap null alloc
|
|
GrBackendRenderTarget backendRT(kW, kH, 1, 0, backendCopy);
|
|
rt = gpu->wrapBackendRenderTarget(backendRT);
|
|
REPORTER_ASSERT(reporter, rt);
|
|
}
|
|
|
|
// When we wrapBackendRenderTarget it is always borrowed, so we must make sure to free the
|
|
// resource when we're done.
|
|
gpu->deleteTestingOnlyBackendTexture(&origBackendTex);
|
|
}
|
|
|
|
void wrap_trt_test(skiatest::Reporter* reporter, GrContext* context) {
|
|
GrVkGpu* gpu = static_cast<GrVkGpu*>(context->contextPriv().getGpu());
|
|
|
|
GrBackendTexture origBackendTex = gpu->createTestingOnlyBackendTexture(nullptr, kW, kH,
|
|
kPixelConfig, true,
|
|
GrMipMapped::kNo);
|
|
const GrVkImageInfo* imageInfo = origBackendTex.getVkImageInfo();
|
|
|
|
sk_sp<GrTexture> tex =
|
|
gpu->wrapRenderableBackendTexture(origBackendTex, 1, kBorrow_GrWrapOwnership);
|
|
REPORTER_ASSERT(reporter, tex);
|
|
|
|
// image is null
|
|
{
|
|
GrVkImageInfo backendCopy = *imageInfo;
|
|
backendCopy.fImage = VK_NULL_HANDLE;
|
|
GrBackendTexture backendTex = GrBackendTexture(kW, kH, backendCopy);
|
|
tex = gpu->wrapRenderableBackendTexture(backendTex, 1, kBorrow_GrWrapOwnership);
|
|
REPORTER_ASSERT(reporter, !tex);
|
|
tex = gpu->wrapRenderableBackendTexture(backendTex, 1, kAdopt_GrWrapOwnership);
|
|
REPORTER_ASSERT(reporter, !tex);
|
|
}
|
|
|
|
// alloc is null
|
|
{
|
|
GrVkImageInfo backendCopy = *imageInfo;
|
|
backendCopy.fAlloc = GrVkAlloc();
|
|
GrBackendTexture backendTex = GrBackendTexture(kW, kH, backendCopy);
|
|
tex = gpu->wrapRenderableBackendTexture(backendTex, 1, kBorrow_GrWrapOwnership);
|
|
REPORTER_ASSERT(reporter, !tex);
|
|
tex = gpu->wrapRenderableBackendTexture(backendTex, 1, kAdopt_GrWrapOwnership);
|
|
REPORTER_ASSERT(reporter, !tex);
|
|
}
|
|
|
|
// check adopt creation
|
|
{
|
|
GrVkImageInfo backendCopy = *imageInfo;
|
|
GrBackendTexture backendTex = GrBackendTexture(kW, kH, backendCopy);
|
|
tex = gpu->wrapRenderableBackendTexture(backendTex, 1, kAdopt_GrWrapOwnership);
|
|
REPORTER_ASSERT(reporter, tex);
|
|
}
|
|
|
|
gpu->deleteTestingOnlyBackendTexture(&origBackendTex, true);
|
|
}
|
|
|
|
DEF_GPUTEST_FOR_VULKAN_CONTEXT(VkWrapTests, reporter, ctxInfo) {
|
|
wrap_tex_test(reporter, ctxInfo.grContext());
|
|
wrap_rt_test(reporter, ctxInfo.grContext());
|
|
wrap_trt_test(reporter, ctxInfo.grContext());
|
|
}
|
|
|
|
#endif
|