mirror of
https://github.com/doitsujin/dxvk.git
synced 2025-03-15 07:29:17 +01:00
[dxvk] Implement sparse image creation
This commit is contained in:
parent
f7c255de2a
commit
2d124b811b
@ -5,7 +5,7 @@
|
||||
namespace dxvk {
|
||||
|
||||
DxvkImage::DxvkImage(
|
||||
const DxvkDevice* device,
|
||||
DxvkDevice* device,
|
||||
const DxvkImageCreateInfo& createInfo,
|
||||
DxvkMemoryAllocator& memAlloc,
|
||||
VkMemoryPropertyFlags memFlags)
|
||||
@ -47,6 +47,7 @@ namespace dxvk {
|
||||
"DxvkImage: Failed to create image:",
|
||||
"\n Type: ", info.imageType,
|
||||
"\n Format: ", info.format,
|
||||
"\n Flags: ", info.flags,
|
||||
"\n Extent: ", "(", info.extent.width,
|
||||
",", info.extent.height,
|
||||
",", info.extent.depth, ")",
|
||||
@ -57,15 +58,16 @@ namespace dxvk {
|
||||
"\n Tiling: ", info.tiling));
|
||||
}
|
||||
|
||||
VkImageMemoryRequirementsInfo2 memoryRequirementInfo = { VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2 };
|
||||
memoryRequirementInfo.image = m_image.image;
|
||||
|
||||
if (!(info.flags & VK_IMAGE_CREATE_SPARSE_BINDING_BIT)) {
|
||||
// Get memory requirements for the image and ask driver
|
||||
// whether we need to use a dedicated allocation.
|
||||
DxvkMemoryRequirements memoryRequirements = { };
|
||||
memoryRequirements.dedicated = { VK_STRUCTURE_TYPE_MEMORY_DEDICATED_REQUIREMENTS };
|
||||
memoryRequirements.core = { VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2, &memoryRequirements.dedicated };
|
||||
|
||||
VkImageMemoryRequirementsInfo2 memoryRequirementInfo = { VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2 };
|
||||
memoryRequirementInfo.image = m_image.image;
|
||||
|
||||
m_vkd->vkGetImageMemoryRequirements2(m_vkd->device(),
|
||||
&memoryRequirementInfo, &memoryRequirements.core);
|
||||
|
||||
@ -124,11 +126,38 @@ namespace dxvk {
|
||||
if (m_vkd->vkBindImageMemory(m_vkd->device(), m_image.image,
|
||||
m_image.memory.memory(), m_image.memory.offset()) != VK_SUCCESS)
|
||||
throw DxvkError("DxvkImage::DxvkImage: Failed to bind device memory");
|
||||
} else {
|
||||
// Initialize sparse info. We do not immediately bind the metadata
|
||||
// aspects of the image here, the caller needs to explicitly do that.
|
||||
m_sparsePageTable = DxvkSparsePageTable(device, this);
|
||||
|
||||
// Allocate memory for sparse metadata if necessary
|
||||
auto properties = m_sparsePageTable.getProperties();
|
||||
|
||||
if (properties.metadataPageCount) {
|
||||
DxvkMemoryRequirements memoryRequirements = { };
|
||||
memoryRequirements.core = { VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2 };
|
||||
|
||||
m_vkd->vkGetImageMemoryRequirements2(m_vkd->device(),
|
||||
&memoryRequirementInfo, &memoryRequirements.core);
|
||||
|
||||
DxvkMemoryProperties memoryProperties = { };
|
||||
memoryProperties.flags = m_memFlags;
|
||||
|
||||
// Set size and alignment to match the metadata requirements
|
||||
auto& core = memoryRequirements.core.memoryRequirements;
|
||||
core.size = SparseMemoryPageSize * properties.metadataPageCount;
|
||||
core.alignment = SparseMemoryPageSize;
|
||||
|
||||
m_image.memory = memAlloc.alloc(memoryRequirements,
|
||||
memoryProperties, DxvkMemoryFlag::GpuReadable);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
DxvkImage::DxvkImage(
|
||||
const DxvkDevice* device,
|
||||
DxvkDevice* device,
|
||||
const DxvkImageCreateInfo& info,
|
||||
VkImage image)
|
||||
: m_vkd(device->vkd()), m_device(device), m_info(info), m_image({ image }) {
|
||||
@ -143,7 +172,8 @@ namespace dxvk {
|
||||
DxvkImage::~DxvkImage() {
|
||||
// This is a bit of a hack to determine whether
|
||||
// the image is implementation-handled or not
|
||||
if (m_image.memory.memory() != VK_NULL_HANDLE)
|
||||
if ((m_image.memory.memory())
|
||||
|| (m_info.flags & VK_IMAGE_CREATE_SPARSE_BINDING_BIT))
|
||||
m_vkd->vkDestroyImage(m_vkd->device(), m_image.image, nullptr);
|
||||
}
|
||||
|
||||
@ -157,6 +187,9 @@ namespace dxvk {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (createInfo.flags & VK_IMAGE_CREATE_SPARSE_BINDING_BIT)
|
||||
return false;
|
||||
|
||||
VkPhysicalDeviceExternalImageFormatInfo externalImageFormatInfo = { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO };
|
||||
externalImageFormatInfo.handleType = sharingInfo.type;
|
||||
|
||||
|
@ -4,6 +4,7 @@
|
||||
#include "dxvk_format.h"
|
||||
#include "dxvk_memory.h"
|
||||
#include "dxvk_resource.h"
|
||||
#include "dxvk_sparse.h"
|
||||
#include "dxvk_util.h"
|
||||
|
||||
namespace dxvk {
|
||||
@ -127,7 +128,7 @@ namespace dxvk {
|
||||
public:
|
||||
|
||||
DxvkImage(
|
||||
const DxvkDevice* device,
|
||||
DxvkDevice* device,
|
||||
const DxvkImageCreateInfo& createInfo,
|
||||
DxvkMemoryAllocator& memAlloc,
|
||||
VkMemoryPropertyFlags memFlags);
|
||||
@ -141,7 +142,7 @@ namespace dxvk {
|
||||
* otherwise some image operations may fail.
|
||||
*/
|
||||
DxvkImage(
|
||||
const DxvkDevice* device,
|
||||
DxvkDevice* device,
|
||||
const DxvkImageCreateInfo& info,
|
||||
VkImage image);
|
||||
|
||||
@ -323,6 +324,16 @@ namespace dxvk {
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Queries sparse page table
|
||||
* \returns Page table, or \c nullptr for a non-sparse resource
|
||||
*/
|
||||
DxvkSparsePageTable* getSparsePageTable() {
|
||||
return m_info.flags & VK_IMAGE_CREATE_SPARSE_BINDING_BIT
|
||||
? &m_sparsePageTable
|
||||
: nullptr;
|
||||
}
|
||||
|
||||
/**
|
||||
* \brief Create a new shared handle to dedicated memory backing the image
|
||||
* \returns The shared handle with the type given by DxvkSharedHandleInfo::type
|
||||
@ -336,6 +347,8 @@ namespace dxvk {
|
||||
DxvkImageCreateInfo m_info;
|
||||
VkMemoryPropertyFlags m_memFlags;
|
||||
DxvkPhysicalImage m_image;
|
||||
DxvkSparsePageTable m_sparsePageTable;
|
||||
|
||||
bool m_shared = false;
|
||||
|
||||
small_vector<VkFormat, 4> m_viewFormats;
|
||||
|
Loading…
x
Reference in New Issue
Block a user