rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-02-22 16:54:27 +01:00
Code Issues Projects Releases Wiki Activity

[dxvk] Make buffer<->image copy format checks more robust

Browse Source 
There are situations where the source format may not match
the image format but the copy is valid nonetheless.
This commit is contained in:
Philip Rebohle 2024-10-07 11:12:56 +02:00 committed by Philip Rebohle
parent e6f90b8003
commit e137f049ee
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/dxvk/dxvk_context.cpp
View File

@ -502,8 +502,7 @@ namespace dxvk {
VkDeviceSize rowAlignment, VkDeviceSize rowAlignment,
VkDeviceSize sliceAlignment, VkDeviceSize sliceAlignment,
VkFormat srcFormat) { VkFormat srcFormat) {
bool useFb = (srcFormat && srcFormat != dstImage->info().format) || bool useFb = !formatsAreCopyCompatible(dstImage->info().format, srcFormat);
(dstImage->formatInfo()->aspectMask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT));
if (useFb) { if (useFb) {
copyBufferToImageFb(dstImage, dstSubresource, dstOffset, dstExtent, copyBufferToImageFb(dstImage, dstSubresource, dstOffset, dstExtent,
@ -630,8 +629,7 @@ namespace dxvk {
VkImageSubresourceLayers srcSubresource, VkImageSubresourceLayers srcSubresource,
VkOffset3D srcOffset, VkOffset3D srcOffset,
VkExtent3D srcExtent) { VkExtent3D srcExtent) {
bool useFb = (dstFormat && dstFormat != srcImage->info().format) || bool useFb = !formatsAreCopyCompatible(srcImage->info().format, dstFormat);
(srcImage->formatInfo()->aspectMask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT));
if (useFb) { if (useFb) {
copyImageToBufferFb(dstBuffer, dstOffset, rowAlignment, sliceAlignment, copyImageToBufferFb(dstBuffer, dstOffset, rowAlignment, sliceAlignment,
@ -2148,8 +2146,7 @@ namespace dxvk {
// Always use framebuffer path for depth-stencil images since we know // Always use framebuffer path for depth-stencil images since we know
// they are writeable and can't use Vulkan transfer queues. Stencil // they are writeable and can't use Vulkan transfer queues. Stencil
// data is interleaved and needs to be decoded manually anyway. // data is interleaved and needs to be decoded manually anyway.
bool useFb = (format && format != image->info().format) || bool useFb = !formatsAreCopyCompatible(image->info().format, format);
(image->formatInfo()->aspectMask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT));
if (useFb) if (useFb)
uploadImageFb(image, source, sourceOffset, format); uploadImageFb(image, source, sourceOffset, format);
@ -6978,6 +6975,21 @@ namespace dxvk {
} }
bool DxvkContext::formatsAreCopyCompatible(
VkFormat imageFormat,
VkFormat bufferFormat) {
if (!bufferFormat)
bufferFormat = imageFormat;
// Depth-stencil data is packed differently in client APIs than what
// we can do in Vulkan, and these formats cannot be reinterpreted.
auto imageFormatInfo = lookupFormatInfo(imageFormat);
auto bufferFormatInfo = lookupFormatInfo(bufferFormat);
return !((imageFormatInfo->aspectMask | bufferFormatInfo->aspectMask) & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT));
}
VkFormat DxvkContext::sanitizeTexelBufferFormat( VkFormat DxvkContext::sanitizeTexelBufferFormat(
VkFormat srcFormat) { VkFormat srcFormat) {
switch (srcFormat) { switch (srcFormat) {

4
src/dxvk/dxvk_context.h
View File

@ -1778,6 +1778,10 @@ namespace dxvk {
void splitCommands(); void splitCommands();
static bool formatsAreCopyCompatible(
VkFormat imageFormat,
VkFormat bufferFormat);
static VkFormat sanitizeTexelBufferFormat( static VkFormat sanitizeTexelBufferFormat(
VkFormat srcFormat); VkFormat srcFormat);