Mesa (main): radv: advertise VK_EXT_image_2d_view_of_3d

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 6dcf7f651f421c0f46ebf9c4c5904f452ea14eb1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6dcf7f651f421c0f46ebf9c4c5904f452ea14eb1

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Tue May  3 08:51:14 2022 +0200

radv: advertise VK_EXT_image_2d_view_of_3d

This pass new dEQP-VK.pipeline.*.image_2d_view_3d_image.*.

This should also fix a GPU hang with Deus Ex: Mankind Divided and Zink.

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/16294>

---

 docs/relnotes/new_features.txt                  |  1 +
 src/amd/vulkan/radv_device.c                    |  8 ++++++
 src/gallium/drivers/zink/ci/zink-radv-fails.txt | 35 -------------------------
 3 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/docs/relnotes/new_features.txt b/docs/relnotes/new_features.txt
index a18e5677cad..a1dd9009e0d 100644
--- a/docs/relnotes/new_features.txt
+++ b/docs/relnotes/new_features.txt
@@ -1,3 +1,4 @@
 WGL_ARB_create_context_robustness
 d3d12 ARB_robust_buffer_access_behavior
 VK_EXT_robustness2 for lavapipe
+VK_EXT_image_2d_view_of_3d on RADV
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 00070969b81..4f0f8e14533 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -487,6 +487,7 @@ radv_physical_device_get_supported_extensions(const struct radv_physical_device
       .EXT_global_priority = true,
       .EXT_global_priority_query = true,
       .EXT_host_query_reset = true,
+      .EXT_image_2d_view_of_3d = true,
       .EXT_image_drm_format_modifier = device->rad_info.chip_class >= GFX9,
       .EXT_image_robustness = true,
       .EXT_image_view_min_lod = true,
@@ -1719,6 +1720,13 @@ radv_GetPhysicalDeviceFeatures2(VkPhysicalDevice physicalDevice,
          features->depthClipControl = true;
          break;
       }
+      case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGE_2D_VIEW_OF_3D_FEATURES_EXT: {
+         VkPhysicalDeviceImage2DViewOf3DFeaturesEXT *features =
+            (VkPhysicalDeviceImage2DViewOf3DFeaturesEXT *)ext;
+         features->image2DViewOf3D = true;
+         features->sampler2DViewOf3D = false;
+         break;
+      }
       default:
          break;
       }
diff --git a/src/gallium/drivers/zink/ci/zink-radv-fails.txt b/src/gallium/drivers/zink/ci/zink-radv-fails.txt
index b455fed59eb..1a0afd19382 100644
--- a/src/gallium/drivers/zink/ci/zink-radv-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-radv-fails.txt
@@ -10,37 +10,6 @@ KHR-GL46.sparse_texture_tests.InternalFormatQueries,Fail
 KHR-GL46.sparse_texture_tests.SparseTextureAllocation,Fail
 KHR-GL46.sparse_texture_tests.SparseTextureCommitment,Fail
 
-#4562
-dEQP-GLES31.functional.image_load_store.3d.load_store.r32f_single_layer,Fail
-dEQP-GLES31.functional.image_load_store.3d.load_store.r32i_single_layer,Fail
-dEQP-GLES31.functional.image_load_store.3d.load_store.r32ui_single_layer,Fail
-dEQP-GLES31.functional.image_load_store.3d.load_store.rgba16f_single_layer,Fail
-dEQP-GLES31.functional.image_load_store.3d.load_store.rgba16i_single_layer,Fail
-dEQP-GLES31.functional.image_load_store.3d.load_store.rgba16ui_single_layer,Fail
-dEQP-GLES31.functional.image_load_store.3d.load_store.rgba32f_single_layer,Fail
-dEQP-GLES31.functional.image_load_store.3d.load_store.rgba32i_single_layer,Fail
-dEQP-GLES31.functional.image_load_store.3d.load_store.rgba32ui_single_layer,Fail
-dEQP-GLES31.functional.image_load_store.3d.load_store.rgba8_single_layer,Fail
-dEQP-GLES31.functional.image_load_store.3d.load_store.rgba8_snorm_single_layer,Fail
-dEQP-GLES31.functional.image_load_store.3d.load_store.rgba8i_single_layer,Fail
-dEQP-GLES31.functional.image_load_store.3d.load_store.rgba8ui_single_layer,Fail
-dEQP-GLES31.functional.image_load_store.3d.store.r32f_single_layer,Fail
-dEQP-GLES31.functional.image_load_store.3d.store.r32i_single_layer,Fail
-dEQP-GLES31.functional.image_load_store.3d.store.r32ui_single_layer,Fail
-dEQP-GLES31.functional.image_load_store.3d.store.rgba16f_single_layer,Fail
-dEQP-GLES31.functional.image_load_store.3d.store.rgba16i_single_layer,Fail
-dEQP-GLES31.functional.image_load_store.3d.store.rgba16ui_single_layer,Fail
-dEQP-GLES31.functional.image_load_store.3d.store.rgba32f_single_layer,Fail
-dEQP-GLES31.functional.image_load_store.3d.store.rgba32i_single_layer,Fail
-dEQP-GLES31.functional.image_load_store.3d.store.rgba32ui_single_layer,Fail
-dEQP-GLES31.functional.image_load_store.3d.store.rgba8_single_layer,Fail
-dEQP-GLES31.functional.image_load_store.3d.store.rgba8_snorm_single_layer,Fail
-dEQP-GLES31.functional.image_load_store.3d.store.rgba8i_single_layer,Fail
-dEQP-GLES31.functional.image_load_store.3d.store.rgba8ui_single_layer,Fail
-
-# probably fixed by EXT_2d_view_of_3d support
-KHR-GL46.shader_image_load_store.non-layered_binding,Fail
-
 # amd issue #6305
 KHR-GL46.shader_ballot_tests.ShaderBallotFunctionRead,Fail
 
@@ -424,10 +393,6 @@ spec at arb_sample_shading@samplemask 8 at sample mask_in_one,Fail
 
 spec at arb_shader_clock@execution at clock2x32,Fail
 spec at arb_shader_clock@execution at clock,Fail
-spec at arb_shader_image_load_store@layer,Fail
-spec at arb_shader_image_load_store@layer at image3D/non-layered binding test,Fail
-spec at arb_shader_image_load_store@level at 3D level binding test,Fail
-spec at arb_shader_image_load_store@level,Fail
 spec at arb_shader_texture_lod@execution at arb_shader_texture_lod-texgradcube,Fail
 spec at arb_shader_texture_lod@execution at glsl-fs-shadow2dgradarb-01,Fail
 spec at arb_shader_texture_lod@execution at glsl-fs-shadow2dgradarb-03,Fail