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

[dxbc] Clean up support check for R32 reads without format

Browse Source
This commit is contained in:
Philip Rebohle 2022-09-04 15:17:38 +02:00
parent 6d9353f4e9
commit e8c1a8e734
2 changed files with 5 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/dxbc/dxbc_options.cpp
View File

@ -21,39 +21,12 @@ namespace dxvk {
= (devInfo.vk11.subgroupSupportedStages & VK_SHADER_STAGE_COMPUTE_BIT) = (devInfo.vk11.subgroupSupportedStages & VK_SHADER_STAGE_COMPUTE_BIT)
&& (devInfo.vk11.subgroupSupportedOperations & VK_SUBGROUP_FEATURE_BALLOT_BIT); && (devInfo.vk11.subgroupSupportedOperations & VK_SUBGROUP_FEATURE_BALLOT_BIT);
supportsTypedUavLoadR32 = true; VkFormatFeatureFlags2 r32Features
supportsTypedUavLoadExtended = true; = device->getFormatFeatures(VK_FORMAT_R32_SFLOAT).optimal
& device->getFormatFeatures(VK_FORMAT_R32_UINT).optimal
& device->getFormatFeatures(VK_FORMAT_R32_SINT).optimal;
static const std::array<std::pair<VkFormat, bool>, 18> s_typedUavFormats = { supportsTypedUavLoadR32 = (r32Features & VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT);
std::make_pair(VK_FORMAT_R32_SFLOAT, false),
std::make_pair(VK_FORMAT_R32_UINT, false),
std::make_pair(VK_FORMAT_R32_SINT, false),
std::make_pair(VK_FORMAT_R32G32B32A32_SFLOAT, true),
std::make_pair(VK_FORMAT_R32G32B32A32_UINT, true),
std::make_pair(VK_FORMAT_R32G32B32A32_SINT, true),
std::make_pair(VK_FORMAT_R16G16B16A16_SFLOAT, true),
std::make_pair(VK_FORMAT_R16G16B16A16_UINT, true),
std::make_pair(VK_FORMAT_R16G16B16A16_SINT, true),
std::make_pair(VK_FORMAT_R8G8B8A8_UNORM, true),
std::make_pair(VK_FORMAT_R8G8B8A8_UINT, true),
std::make_pair(VK_FORMAT_R8G8B8A8_SINT, true),
std::make_pair(VK_FORMAT_R16_SFLOAT, true),
std::make_pair(VK_FORMAT_R16_UINT, true),
std::make_pair(VK_FORMAT_R16_SINT, true),
std::make_pair(VK_FORMAT_R8_UNORM, true),
std::make_pair(VK_FORMAT_R8_UINT, true),
std::make_pair(VK_FORMAT_R8_SINT, true),
};
for (const auto& f : s_typedUavFormats) {
DxvkFormatFeatures features = device->getFormatFeatures(f.first);
VkFormatFeatureFlags2 imgFeatures = features.optimal | features.linear;
if (!(imgFeatures & VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT)) {
supportsTypedUavLoadR32 &= f.second;
supportsTypedUavLoadExtended = false;
}
}
switch (device->config().useRawSsbo) { switch (device->config().useRawSsbo) {
case Tristate::Auto: minSsboAlignment = devInfo.core.properties.limits.minStorageBufferOffsetAlignment; break; case Tristate::Auto: minSsboAlignment = devInfo.core.properties.limits.minStorageBufferOffsetAlignment; break;

1
src/dxbc/dxbc_options.h
View File

@ -26,7 +26,6 @@ namespace dxvk {
/// Determines whether format qualifiers /// Determines whether format qualifiers
/// on typed UAV loads are required /// on typed UAV loads are required
bool supportsTypedUavLoadR32 = false; bool supportsTypedUavLoadR32 = false;
bool supportsTypedUavLoadExtended = false;
/// Use subgroup operations to reduce the number of /// Use subgroup operations to reduce the number of
/// atomic operations for append/consume buffers. /// atomic operations for append/consume buffers.