Mesa (main): radv: remove unnecessary FIXME about custom sample locations
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Aug 9 11:57:49 UTC 2021
Module: Mesa
Branch: main
Commit: 21c8a95e3467a9369f3747cfcf134baf49994869
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=21c8a95e3467a9369f3747cfcf134baf49994869
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date: Fri Aug 6 17:23:29 2021 +0200
radv: remove unnecessary FIXME about custom sample locations
VK_EXT_sample_locations is disabled on GFX10+.
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12247>
---
src/amd/vulkan/radv_device.c | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 729952682c2..3de60bc0c05 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -2237,17 +2237,8 @@ radv_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice,
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLE_LOCATIONS_PROPERTIES_EXT: {
VkPhysicalDeviceSampleLocationsPropertiesEXT *properties =
(VkPhysicalDeviceSampleLocationsPropertiesEXT *)ext;
-
- VkSampleCountFlagBits supported_samples = VK_SAMPLE_COUNT_2_BIT | VK_SAMPLE_COUNT_4_BIT;
- if (pdevice->rad_info.chip_class < GFX10) {
- /* FIXME: Some MSAA8x tests fail for weird
- * reasons on GFX10+ when the same pattern is
- * used inside the same render pass.
- */
- supported_samples |= VK_SAMPLE_COUNT_8_BIT;
- }
-
- properties->sampleLocationSampleCounts = supported_samples;
+ properties->sampleLocationSampleCounts = VK_SAMPLE_COUNT_2_BIT | VK_SAMPLE_COUNT_4_BIT |
+ VK_SAMPLE_COUNT_8_BIT;
properties->maxSampleLocationGridSize = (VkExtent2D){2, 2};
properties->sampleLocationCoordinateRange[0] = 0.0f;
properties->sampleLocationCoordinateRange[1] = 0.9375f;
@@ -7941,11 +7932,8 @@ radv_GetPhysicalDeviceMultisamplePropertiesEXT(VkPhysicalDevice physicalDevice,
VkSampleCountFlagBits samples,
VkMultisamplePropertiesEXT *pMultisampleProperties)
{
- RADV_FROM_HANDLE(radv_physical_device, physical_device, physicalDevice);
- VkSampleCountFlagBits supported_samples = VK_SAMPLE_COUNT_2_BIT | VK_SAMPLE_COUNT_4_BIT;
-
- if (physical_device->rad_info.chip_class < GFX10)
- supported_samples |= VK_SAMPLE_COUNT_8_BIT;
+ VkSampleCountFlagBits supported_samples = VK_SAMPLE_COUNT_2_BIT | VK_SAMPLE_COUNT_4_BIT |
+ VK_SAMPLE_COUNT_8_BIT;
if (samples & supported_samples) {
pMultisampleProperties->maxSampleLocationGridSize = (VkExtent2D){2, 2};
More information about the mesa-commit
mailing list