OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: disable VRS coarse shading with 8x MSAA on GFX12

Browse Source 
This isn't supported and the hw always clamps to 1x1.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32914>
This commit is contained in:
Samuel Pitoiset
2025-01-06 00:30:24 -08:00
committed by Marge Bot
parent c5954c4329
commit 0b53e645a0
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/amd/vulkan/radv_physical_device.c
View File

@@ -1775,8 +1775,9 @@ radv_get_physical_device_properties(struct radv_physical_device *pdev)
.fragmentShadingRateNonTrivialCombinerOps = true, .fragmentShadingRateNonTrivialCombinerOps = true,
.maxFragmentSize = (VkExtent2D){2, 2}, .maxFragmentSize = (VkExtent2D){2, 2},
.maxFragmentSizeAspectRatio = 2, .maxFragmentSizeAspectRatio = 2,
.maxFragmentShadingRateCoverageSamples = 32, .maxFragmentShadingRateCoverageSamples = pdev->info.gfx_level >= GFX12 ? 16 : 32,
.maxFragmentShadingRateRasterizationSamples = VK_SAMPLE_COUNT_8_BIT, .maxFragmentShadingRateRasterizationSamples =
pdev->info.gfx_level >= GFX12 ? VK_SAMPLE_COUNT_4_BIT : VK_SAMPLE_COUNT_8_BIT,
.fragmentShadingRateWithShaderDepthStencilWrites = !pdev->info.has_vrs_ds_export_bug, .fragmentShadingRateWithShaderDepthStencilWrites = !pdev->info.has_vrs_ds_export_bug,
.fragmentShadingRateWithSampleMask = true, .fragmentShadingRateWithSampleMask = true,
.fragmentShadingRateWithShaderSampleMask = false, .fragmentShadingRateWithShaderSampleMask = false,
@@ -2697,6 +2698,7 @@ VKAPI_ATTR VkResult VKAPI_CALL
radv_GetPhysicalDeviceFragmentShadingRatesKHR(VkPhysicalDevice physicalDevice, uint32_t *pFragmentShadingRateCount, radv_GetPhysicalDeviceFragmentShadingRatesKHR(VkPhysicalDevice physicalDevice, uint32_t *pFragmentShadingRateCount,
VkPhysicalDeviceFragmentShadingRateKHR *pFragmentShadingRates) VkPhysicalDeviceFragmentShadingRateKHR *pFragmentShadingRates)
{ {
VK_FROM_HANDLE(radv_physical_device, pdev, physicalDevice);
VK_OUTARRAY_MAKE_TYPED(VkPhysicalDeviceFragmentShadingRateKHR, out, pFragmentShadingRates, VK_OUTARRAY_MAKE_TYPED(VkPhysicalDeviceFragmentShadingRateKHR, out, pFragmentShadingRates,
pFragmentShadingRateCount); pFragmentShadingRateCount);
@@ -2717,7 +2719,13 @@ radv_GetPhysicalDeviceFragmentShadingRatesKHR(VkPhysicalDevice physicalDevice, u
if (x == 1 && y == 1) { if (x == 1 && y == 1) {
samples = ~0; samples = ~0;
} else { } else {
samples = VK_SAMPLE_COUNT_1_BIT | VK_SAMPLE_COUNT_2_BIT | VK_SAMPLE_COUNT_4_BIT | VK_SAMPLE_COUNT_8_BIT; samples = VK_SAMPLE_COUNT_1_BIT | VK_SAMPLE_COUNT_2_BIT | VK_SAMPLE_COUNT_4_BIT;
/* VRS coarse shading with 8x MSAA isn't supported on GFX12 and the
* hw automatically clamps to 1x1.
*/
if (pdev->info.gfx_level < GFX12)
samples |= VK_SAMPLE_COUNT_8_BIT;
} }
append_rate(x, y, samples); append_rate(x, y, samples);