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

[dxvk] Allow querying external memory features for image formats

Browse Source
This commit is contained in:
Philip Rebohle 2022-09-11 15:28:14 +02:00
parent 3a636f6094
commit c0fdf1449c
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/dxvk/dxvk_device.cpp
View File

@ -46,6 +46,9 @@ namespace dxvk {
const DxvkFormatQuery& query) const { const DxvkFormatQuery& query) const {
auto vk = m_adapter->vki(); auto vk = m_adapter->vki();
VkPhysicalDeviceExternalImageFormatInfo externalInfo = { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTERNAL_IMAGE_FORMAT_INFO };
externalInfo.handleType = query.handleType;
VkPhysicalDeviceImageFormatInfo2 info = { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2 }; VkPhysicalDeviceImageFormatInfo2 info = { VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_FORMAT_INFO_2 };
info.format = query.format; info.format = query.format;
info.type = query.type; info.type = query.type;
@ -53,20 +56,28 @@ namespace dxvk {
info.usage = query.usage; info.usage = query.usage;
info.flags = query.flags; info.flags = query.flags;
if (externalInfo.handleType)
externalInfo.pNext = std::exchange(info.pNext, &externalInfo);
VkExternalImageFormatProperties externalProperties = { VK_STRUCTURE_TYPE_EXTERNAL_IMAGE_FORMAT_PROPERTIES };
VkImageFormatProperties2 properties = { VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2 }; VkImageFormatProperties2 properties = { VK_STRUCTURE_TYPE_IMAGE_FORMAT_PROPERTIES_2 };
if (externalInfo.handleType)
externalProperties.pNext = std::exchange(properties.pNext, &externalProperties);
VkResult vr = vk->vkGetPhysicalDeviceImageFormatProperties2( VkResult vr = vk->vkGetPhysicalDeviceImageFormatProperties2(
m_adapter->handle(), &info, &properties); m_adapter->handle(), &info, &properties);
if (vr != VK_SUCCESS) if (vr != VK_SUCCESS)
return std::nullopt; return std::nullopt;
DxvkFormatLimits result; DxvkFormatLimits result = { };
result.maxExtent = properties.imageFormatProperties.maxExtent; result.maxExtent = properties.imageFormatProperties.maxExtent;
result.maxMipLevels = properties.imageFormatProperties.maxMipLevels; result.maxMipLevels = properties.imageFormatProperties.maxMipLevels;
result.maxArrayLayers = properties.imageFormatProperties.maxArrayLayers; result.maxArrayLayers = properties.imageFormatProperties.maxArrayLayers;
result.sampleCounts = properties.imageFormatProperties.sampleCounts; result.sampleCounts = properties.imageFormatProperties.sampleCounts;
result.maxResourceSize = properties.imageFormatProperties.maxResourceSize; result.maxResourceSize = properties.imageFormatProperties.maxResourceSize;
result.externalFeatures = externalProperties.externalMemoryProperties.externalMemoryFeatures;
return result; return result;
} }

2
src/dxvk/dxvk_format.h
View File

@ -32,6 +32,7 @@ namespace dxvk {
uint32_t maxArrayLayers; uint32_t maxArrayLayers;
VkSampleCountFlags sampleCounts; VkSampleCountFlags sampleCounts;
VkDeviceSize maxResourceSize; VkDeviceSize maxResourceSize;
VkExternalMemoryFeatureFlags externalFeatures;
}; };
/** /**
@ -43,6 +44,7 @@ namespace dxvk {
VkImageTiling tiling; VkImageTiling tiling;
VkImageUsageFlags usage; VkImageUsageFlags usage;
VkImageCreateFlags flags; VkImageCreateFlags flags;
VkExternalMemoryHandleTypeFlagBits handleType;
}; };
/** /**