Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-04-30 06:39:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[vk] SL Table order

Browse source
This commit is contained in:
CamilleLaVey 2025-12-05 07:54:55 -04:00 • committed by Caio Oliveira
parent 7d69ff6044
commit 2d617438b0
No known key found for this signature in database
GPG key ID: AAAE6C7FD4186B0C
2 changed files with 37 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/video_core/vulkan_common/vulkan_device.cpp
View file

@ -110,14 +110,14 @@ constexpr std::array R16G16B16A16_UNORM{
} // namespace Alternatives } // namespace Alternatives
constexpr std::array<VkSampleCountFlagBits, Device::sample_location_table_size> constexpr std::array<VkSampleCountFlagBits, Device::SampleLocationTableSize()>
sample_location_query_counts{ sample_location_query_counts{
VK_SAMPLE_COUNT_1_BIT, VK_SAMPLE_COUNT_2_BIT, VK_SAMPLE_COUNT_4_BIT, VK_SAMPLE_COUNT_1_BIT, VK_SAMPLE_COUNT_2_BIT, VK_SAMPLE_COUNT_4_BIT,
VK_SAMPLE_COUNT_8_BIT, VK_SAMPLE_COUNT_16_BIT, VK_SAMPLE_COUNT_32_BIT, VK_SAMPLE_COUNT_8_BIT, VK_SAMPLE_COUNT_16_BIT, VK_SAMPLE_COUNT_32_BIT,
VK_SAMPLE_COUNT_64_BIT, VK_SAMPLE_COUNT_64_BIT,
}; };
static_assert(sample_location_query_counts.size() == Device::sample_location_table_size); static_assert(sample_location_query_counts.size() == Device::SampleLocationTableSize());
constexpr size_t SampleCountIndex(VkSampleCountFlagBits samples) { constexpr size_t SampleCountIndex(VkSampleCountFlagBits samples) {
for (size_t index = 0; index < sample_location_query_counts.size(); ++index) { for (size_t index = 0; index < sample_location_query_counts.size(); ++index) {
@ -1598,6 +1598,36 @@ void Device::RemoveUnsuitableExtensions() {
RemoveExtensionFeatureIfUnsuitable(extensions.maintenance4, features.maintenance4, RemoveExtensionFeatureIfUnsuitable(extensions.maintenance4, features.maintenance4,
VK_KHR_MAINTENANCE_4_EXTENSION_NAME); VK_KHR_MAINTENANCE_4_EXTENSION_NAME);
// VK_KHR_maintenance5
extensions.maintenance5 = features.maintenance5.maintenance5;
if (extensions.maintenance5) {
LOG_INFO(Render_Vulkan, "VK_KHR_maintenance5 properties: polygonModePointSize={} "
"depthStencilSwizzleOne={} earlyFragmentTests={} nonStrictWideLines={}",
properties.maintenance5.polygonModePointSize,
properties.maintenance5.depthStencilSwizzleOneSupport,
properties.maintenance5.earlyFragmentMultisampleCoverageAfterSampleCounting &&
properties.maintenance5.earlyFragmentSampleMaskTestBeforeSampleCounting,
properties.maintenance5.nonStrictWideLinesUseParallelogram);
}
RemoveExtensionFeatureIfUnsuitable(extensions.maintenance5, features.maintenance5,
VK_KHR_MAINTENANCE_5_EXTENSION_NAME);
// VK_KHR_maintenance6
extensions.maintenance6 = features.maintenance6.maintenance6;
RemoveExtensionFeatureIfUnsuitable(extensions.maintenance6, features.maintenance6,
VK_KHR_MAINTENANCE_6_EXTENSION_NAME);
// VK_KHR_maintenance7 (proposed for Vulkan 1.4, no features)
extensions.maintenance7 = loaded_extensions.contains(VK_KHR_MAINTENANCE_7_EXTENSION_NAME);
RemoveExtensionIfUnsuitable(extensions.maintenance7, VK_KHR_MAINTENANCE_7_EXTENSION_NAME);
// VK_KHR_maintenance8 (proposed for Vulkan 1.4, no features)
extensions.maintenance8 = loaded_extensions.contains(VK_KHR_MAINTENANCE_8_EXTENSION_NAME);
RemoveExtensionIfUnsuitable(extensions.maintenance8, VK_KHR_MAINTENANCE_8_EXTENSION_NAME);
}
VkExtent2D Device::SampleLocationGridSizeFor(VkSampleCountFlagBits samples) const { VkExtent2D Device::SampleLocationGridSizeFor(VkSampleCountFlagBits samples) const {
const auto sanitize = [](VkExtent2D grid) { const auto sanitize = [](VkExtent2D grid) {
@ -1657,36 +1687,6 @@ void Device::PopulateSampleLocationGrids() {
} }
sample_location_grids[index] = grid; sample_location_grids[index] = grid;
} }
}
// VK_KHR_maintenance5
extensions.maintenance5 = features.maintenance5.maintenance5;
if (extensions.maintenance5) {
LOG_INFO(Render_Vulkan, "VK_KHR_maintenance5 properties: polygonModePointSize={} "
"depthStencilSwizzleOne={} earlyFragmentTests={} nonStrictWideLines={}",
properties.maintenance5.polygonModePointSize,
properties.maintenance5.depthStencilSwizzleOneSupport,
properties.maintenance5.earlyFragmentMultisampleCoverageAfterSampleCounting &&
properties.maintenance5.earlyFragmentSampleMaskTestBeforeSampleCounting,
properties.maintenance5.nonStrictWideLinesUseParallelogram);
}
RemoveExtensionFeatureIfUnsuitable(extensions.maintenance5, features.maintenance5,
VK_KHR_MAINTENANCE_5_EXTENSION_NAME);
// VK_KHR_maintenance6
extensions.maintenance6 = features.maintenance6.maintenance6;
RemoveExtensionFeatureIfUnsuitable(extensions.maintenance6, features.maintenance6,
VK_KHR_MAINTENANCE_6_EXTENSION_NAME);
// VK_KHR_maintenance7 (proposed for Vulkan 1.4, no features)
extensions.maintenance7 = loaded_extensions.contains(VK_KHR_MAINTENANCE_7_EXTENSION_NAME);
RemoveExtensionIfUnsuitable(extensions.maintenance7, VK_KHR_MAINTENANCE_7_EXTENSION_NAME);
// VK_KHR_maintenance8 (proposed for Vulkan 1.4, no features)
extensions.maintenance8 = loaded_extensions.contains(VK_KHR_MAINTENANCE_8_EXTENSION_NAME);
RemoveExtensionIfUnsuitable(extensions.maintenance8, VK_KHR_MAINTENANCE_8_EXTENSION_NAME);
} }
bool Device::SupportsSubgroupStage(VkShaderStageFlags stage_mask) const { bool Device::SupportsSubgroupStage(VkShaderStageFlags stage_mask) const {

5
src/video_core/vulkan_common/vulkan_device.h
View file

@ -979,7 +979,12 @@ public:
return nvidia_arch; return nvidia_arch;
} }
static constexpr size_t SampleLocationTableSize() {
return sample_location_table_size;
}
private: private:
static constexpr size_t sample_location_table_size = 7; static constexpr size_t sample_location_table_size = 7;
/// Checks if the physical device is suitable and configures the object state /// Checks if the physical device is suitable and configures the object state