Skip to content

Commit 1395411

Browse files
committed
Add shaderStorageImageMultisample requirement
1 parent 0ccb23b commit 1395411

3 files changed

Lines changed: 14 additions & 3 deletions

File tree

lib/API/VK/Device.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2480,9 +2480,10 @@ class VulkanDevice : public offloadtest::Device {
24802480

24812481
for (auto &ResRef : R.ResourceRefs) {
24822482
ImageBarrier.image = ResRef.Image.Image;
2483-
vkCmdPipelineBarrier(IS.CmdBuffer, VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
2484-
VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, nullptr, 0,
2485-
nullptr, 1, &ImageBarrier);
2483+
vkCmdPipelineBarrier(
2484+
IS.CmdBuffer, VK_PIPELINE_STAGE_TRANSFER_BIT,
2485+
getPipelineStageMaskForShaderStages(IS.getFullShaderStageMask()), 0,
2486+
0, nullptr, 0, nullptr, 1, &ImageBarrier);
24862487
}
24872488

24882489
llvm::SmallVector<VkBufferImageCopy> Regions;

test/Feature/Textures/Texture2DMS/Texture2DMS.Load.test.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,12 @@ Results:
9393
# Unimplemented: Clang + Vulkan: https://github.com/llvm/llvm-project/issues/124566
9494
# XFAIL: Clang && Vulkan
9595

96+
# Intel Vulkan reports shaderStorageImageMultisample, but this test currently
97+
# reads sample 0 values for sample 1/2/3 after multisample upload.
98+
# XFAIL: Intel && Vulkan
99+
96100
# REQUIRES: SampleCount_4
101+
# REQUIRES: shaderStorageImageMultisample
97102

98103
# RUN: split-file %s %t
99104
# RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl

test/Feature/Textures/Texture2DMSArray/Texture2DMSArray.Load.test.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,12 @@ Results:
7878
# Unimplemented: Clang + Vulkan: https://github.com/llvm/llvm-project/issues/124566
7979
# XFAIL: Clang && Vulkan
8080

81+
# Intel Vulkan reports shaderStorageImageMultisample, but this test currently
82+
# reads sample 0 values for sample 1/2/3 after multisample upload.
83+
# XFAIL: Intel && Vulkan
84+
8185
# REQUIRES: SampleCount_4
86+
# REQUIRES: shaderStorageImageMultisample
8287

8388
# RUN: split-file %s %t
8489
# RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl

0 commit comments

Comments
 (0)