radv: replace == GFX10 with >= GFX10 where it's needed

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5389>

diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index e4bbbab4ca2bcbc5f766803269ac961d724fbf5e..8c65eb6bc37474c4e6d3ad504300f7051898f86d 100644 (file)
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -98,7 +98,7 @@ radv_use_tc_compat_htile_for_image(struct radv_device *device,
        if (pCreateInfo->samples >= 2 &&
            (format == VK_FORMAT_D32_SFLOAT_S8_UINT ||
             (format == VK_FORMAT_D32_SFLOAT &&
-             device->physical_device->rad_info.chip_class == GFX10)))
+             device->physical_device->rad_info.chip_class >= GFX10)))
                return false;
 
        /* GFX9 supports both 32-bit and 16-bit depth surfaces, while GFX8 only

diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c
index e8ad6d83df3c0276e55752ee143850895dd2613a..6ad327b2003efe5aed6641c147d1e00963ff6383 100644 (file)
--- a/src/amd/vulkan/radv_nir_to_llvm.c
+++ b/src/amd/vulkan/radv_nir_to_llvm.c
@@ -1271,7 +1271,7 @@ handle_vs_input_decl(struct radv_shader_context *ctx,
                 * access are detected. Only GFX6 and GFX10 are affected.
                 */
                bool unaligned_vertex_fetches = false;
-               if ((ctx->ac.chip_class == GFX6 || ctx->ac.chip_class == GFX10) &&
+               if ((ctx->ac.chip_class == GFX6 || ctx->ac.chip_class >= GFX10) &&
                    vtx_info->chan_format != data_format &&
                    ((attrib_offset % vtx_info->element_size) ||
                     (attrib_stride % vtx_info->element_size)))
@@ -1282,7 +1282,7 @@ handle_vs_input_decl(struct radv_shader_context *ctx,
                        LLVMValueRef values[4];
 
                        assert(ctx->ac.chip_class == GFX6 ||
-                              ctx->ac.chip_class == GFX10);
+                              ctx->ac.chip_class >= GFX10);
 
                        for (unsigned chan  = 0; chan < num_channels; chan++) {
                                unsigned chan_offset = attrib_offset + chan * vtx_info->chan_byte_size;