Vulkan: Fix image bindings for non-layered textures

Layer index must be ignored if the texture
does not have multiple layers or faces.

Fixed: angleproject:344950165
Change-Id: I4b402ee28d365f0459f980e01488828c80c93527
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6185849
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Commit-Queue: Alexey Knyazev <lexa.knyazev@gmail.com>

Author: lexaknyazev

src/libANGLE/renderer/vulkan/TextureVk.cpp

@@ -3817,7 +3817,9 @@ angle::Result TextureVk::getStorageImageView(vk::Context *context,
         getNativeImageLevel(gl::LevelIndex(static_cast<uint32_t>(binding.level)));
     vk::LevelIndex nativeLevelVk = mImage->toVkLevel(nativeLevelGL);
 
-    if (binding.layered != GL_TRUE)
+    // If the texture does not have multiple layers or faces, the entire texture
+    // level is bound, regardless of the values specified by layered and layer.
+    if (binding.layered != GL_TRUE && IsLayeredTextureType(mState.getType()))
     {
         uint32_t nativeLayer = getNativeImageLayer(static_cast<uint32_t>(binding.layer));
 

src/tests/angle_end2end_tests_expectations.txt

@@ -1218,9 +1218,6 @@ b/330697097 PIXEL6 VULKAN : FramebufferTest_ES31.MultisampleResolveBothAttachmen
 42264522 PIXEL4ORXL VULKAN : ComputeShaderTest.SSBOAliasOverWrite/* = SKIP
 b/266235549 D3D11 : ComputeShaderTest.SSBOAliasOverWrite/* = SKIP
 
-// Incorrect image binding in Vulkan backend
-344950165 VULKAN : TextureTestES31.Texture2DLayered/* = SKIP
-
 // Samsung Galaxy S22 (Xclipse)
 b/267953710 GALAXYS22 GLES : VulkanImageTest.DeviceVulkan/* = SKIP
 b/267953710 GALAXYS22 GLES : VulkanImageTest.HasVulkanImageExtensions/* = SKIP

src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt

@@ -379,6 +379,3 @@ b/328156792 PINEAPPLE VULKAN : KHR-GLES31.core.texture_cube_map_array* = SKIP
 379700129 PIXEL4ORXL VULKAN : KHR-GLES31.core.texture_stencil8.multisample = SKIP
 379700129 PIXEL6 VULKAN : KHR-GLES31.core.texture_stencil8.multisample = SKIP
 379700129 GALAXYS22 VULKAN : KHR-GLES31.core.texture_stencil8.multisample = SKIP
-
-// New test in VK-GL-CTS roll 2024-12-27
-386087992 VULKAN : KHR-GLES31.core.bind_image_texture.single_layer = SKIP