Mesa (staging/21.1): radv: disable VK_FORMAT_R64_SFLOAT

[GitLab Mirror]

Module: Mesa
Branch: staging/21.1
Commit: 5dfe95bb25bf410c98c2d43700708246102f5c54
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5dfe95bb25bf410c98c2d43700708246102f5c54

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Mon Apr 26 11:45:32 2021 +0100

radv: disable VK_FORMAT_R64_SFLOAT

This format was enabled by accident, isn't useful, and doesn't work.

Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4701
Cc: 21.1 <mesa-stable>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10450>
(cherry picked from commit 816ec3ecb4667a509c4ded1972151c00907f7f5d)

---

 .pick_status.json             | 2 +-
 src/amd/vulkan/radv_formats.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index a3d79089732..4cd012d018d 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -112,7 +112,7 @@
         "description": "radv: disable VK_FORMAT_R64_SFLOAT",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/amd/vulkan/radv_formats.c b/src/amd/vulkan/radv_formats.c
index d4ad6a35b6a..e3477f37351 100644
--- a/src/amd/vulkan/radv_formats.c
+++ b/src/amd/vulkan/radv_formats.c
@@ -105,7 +105,7 @@ radv_translate_buffer_dataformat(const struct util_format_description *desc, int
       }
       break;
    case 64:
-      if (desc->nr_channels == 1)
+      if (type != UTIL_FORMAT_TYPE_FLOAT && desc->nr_channels == 1)
          return V_008F0C_BUF_DATA_FORMAT_32_32;
    }
 
@@ -363,7 +363,7 @@ radv_translate_tex_dataformat(VkFormat format, const struct util_format_descript
       }
       break;
    case 64:
-      if (desc->nr_channels == 1)
+      if (desc->channel[0].type != UTIL_FORMAT_TYPE_FLOAT && desc->nr_channels == 1)
          return V_008F14_IMG_DATA_FORMAT_32_32;
       break;
    }
@@ -475,7 +475,7 @@ radv_is_sampler_format_supported(VkFormat format, bool *linear_sampling)
    const struct util_format_description *desc = vk_format_description(format);
    uint32_t num_format;
    if (!desc || format == VK_FORMAT_UNDEFINED || format == VK_FORMAT_R64_UINT ||
-       format == VK_FORMAT_R64_SINT || format == VK_FORMAT_R64_SFLOAT)
+       format == VK_FORMAT_R64_SINT)
       return false;
    num_format =
       radv_translate_tex_numformat(format, desc, vk_format_get_first_non_void_channel(format));