AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove deprecated Vulkan GrBackendRenderTarget constructor

Browse Source 
Change-Id: I3bda64f7c03245e751bb19520ec7ed07e5c1d59e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319780
Auto-Submit: Brian Salomon <bsalomon@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
This commit is contained in:
Brian Salomon 2020-09-25 15:27:54 -04:00 committed by Skia Commit-Bot
parent c14defb8bf
commit 4e48490717
4 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/gpu/GrBackendSurface.h
View File

@ -428,12 +428,6 @@ public:
#endif
#ifdef SK_VULKAN
/** Deprecated, use version that does not take stencil bits. */
GrBackendRenderTarget(int width,
int height,
int sampleCnt,
int stencilBits,
const GrVkImageInfo& vkInfo);
GrBackendRenderTarget(int width, int height, int sampleCnt, const GrVkImageInfo& vkInfo);
#endif

15
src/gpu/GrBackendSurface.cpp
View File

@ -852,21 +852,6 @@ GrBackendRenderTarget::GrBackendRenderTarget(int width,
#endif
#ifdef SK_VULKAN
GrBackendRenderTarget::GrBackendRenderTarget(int width,
int height,
int sampleCnt,
int stencilBits,
const GrVkImageInfo& vkInfo)
: GrBackendRenderTarget(width, height, sampleCnt, vkInfo) {
// TODO: Do we want to set fFramebufferOnly here based on vkInfo usage flags? Some thing like
// this:
// fFramebufferOnly =
// ((VK_IMAGE_USAGE_TRANSFER_SRC_BIT|VK_IMAGE_USAGE_SAMPLED_BIT) & vkInfo.fImageUsageFlags)
// ? false : true;
// This is a deprecated constructor that takes a bogus stencil bits.
SkASSERT(0 == stencilBits);
}
GrBackendRenderTarget::GrBackendRenderTarget(int width,
int height,
int sampleCnt,

2
src/gpu/vk/GrVkGpu.cpp
View File

@ -2024,7 +2024,7 @@ GrBackendRenderTarget GrVkGpu::createTestingOnlyBackendRenderTarget(int w, int h
return {};
}
return GrBackendRenderTarget(w, h, 1, 0, info);
return GrBackendRenderTarget(w, h, 1, info);
}
void GrVkGpu::deleteTestingOnlyBackendRenderTarget(const GrBackendRenderTarget& rt) {

6
tests/VkWrapTests.cpp
View File

@ -95,7 +95,7 @@ void wrap_rt_test(skiatest::Reporter* reporter, GrDirectContext* dContext) {
GrVkImageInfo imageInfo;
SkAssertResult(origBackendTex.getVkImageInfo(&imageInfo));
GrBackendRenderTarget origBackendRT(kW, kH, 1, 0, imageInfo);
GrBackendRenderTarget origBackendRT(kW, kH, 1, imageInfo);
sk_sp<GrRenderTarget> rt = gpu->wrapBackendRenderTarget(origBackendRT);
REPORTER_ASSERT(reporter, rt);
@ -104,7 +104,7 @@ void wrap_rt_test(skiatest::Reporter* reporter, GrDirectContext* dContext) {
{
GrVkImageInfo backendCopy = imageInfo;
backendCopy.fImage = VK_NULL_HANDLE;
GrBackendRenderTarget backendRT(kW, kH, 1, 0, backendCopy);
GrBackendRenderTarget backendRT(kW, kH, 1, backendCopy);
rt = gpu->wrapBackendRenderTarget(backendRT);
REPORTER_ASSERT(reporter, !rt);
}
@ -114,7 +114,7 @@ void wrap_rt_test(skiatest::Reporter* reporter, GrDirectContext* dContext) {
GrVkImageInfo backendCopy = imageInfo;
backendCopy.fAlloc = GrVkAlloc();
// can wrap null alloc
GrBackendRenderTarget backendRT(kW, kH, 1, 0, backendCopy);
GrBackendRenderTarget backendRT(kW, kH, 1, backendCopy);
rt = gpu->wrapBackendRenderTarget(backendRT);
REPORTER_ASSERT(reporter, rt);
}