AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2024-10-18 11:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

val: re-add ImageMSArray validation (#5394)

Browse Source 
This has been removed in #4752, but not added since.

* fixup! val: re-add ImageMSArray validation

clang-format
This commit is contained in:
Nathan Gauër 2023-09-07 15:39:28 +02:00 committed by GitHub
parent d660bb55be
commit 47b63a4d7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 113 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/val/validate_image.cpp
View File

@ -693,16 +693,11 @@ spv_result_t ValidateImageReadWrite(ValidationState_t& _,
<< "storage image";
}
if (info.multisampled == 1 &&
if (info.multisampled == 1 && info.arrayed == 1 && info.sampled == 2 &&
!_.HasCapability(spv::Capability::ImageMSArray)) {
#if 0
// TODO(atgoo@github.com) The description of this rule in the spec
// is unclear and Glslang doesn't declare ImageMSArray. Need to clarify
// and reenable.
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< "Capability ImageMSArray is required to access storage "
<< "image";
#endif
<< "Capability ImageMSArray is required to access storage "
<< "image";
}
} else if (info.sampled != 0) {
return _.diag(SPV_ERROR_INVALID_DATA, inst)

110
test/val/val_image_test.cpp
View File

@ -7936,6 +7936,116 @@ TEST_F(ValidateImage, QCOMImageProcessingSampleWeightedInvalidUseB) {
HasSubstr("Illegal use of QCOM image processing decorated texture"));
}
TEST_F(ValidateImage, ImageMSArray_ArrayedSampledTypeRequiresCapability) {
const std::string code = R"(
OpCapability Shader
OpCapability StorageImageMultisample
OpCapability StorageImageReadWithoutFormat
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %main "main"
OpExecutionMode %main OriginUpperLeft
OpDecorate %var_image DescriptorSet 0
OpDecorate %var_image Binding 1
%void = OpTypeVoid
%func = OpTypeFunction %void
%f32 = OpTypeFloat 32
%u32 = OpTypeInt 32 0
%uint_2 = OpConstant %u32 2
%uint_1 = OpConstant %u32 1
%v2uint = OpTypeVector %u32 2
%v4float = OpTypeVector %f32 4
%image = OpTypeImage %f32 2D 2 1 1 2 Unknown
%ptr_image = OpTypePointer UniformConstant %image
%10 = OpConstantComposite %v2uint %uint_1 %uint_2
%var_image = OpVariable %ptr_image UniformConstant
%main = OpFunction %void None %func
%main_lab = OpLabel
%18 = OpLoad %image %var_image
%19 = OpImageRead %v4float %18 %10 Sample %uint_2
OpReturn
OpFunctionEnd
)";
const spv_target_env env = SPV_ENV_VULKAN_1_0;
CompileSuccessfully(code, env);
ASSERT_EQ(SPV_ERROR_INVALID_DATA, ValidateInstructions(env));
EXPECT_THAT(
getDiagnosticString(),
HasSubstr("Capability ImageMSArray is required to access storage image"));
}
TEST_F(ValidateImage, ImageMSArray_SampledTypeDoesNotRequireCapability) {
const std::string code = R"(
OpCapability Shader
OpCapability StorageImageMultisample
OpCapability StorageImageReadWithoutFormat
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %main "main"
OpExecutionMode %main OriginUpperLeft
OpDecorate %var_image DescriptorSet 0
OpDecorate %var_image Binding 1
%void = OpTypeVoid
%func = OpTypeFunction %void
%f32 = OpTypeFloat 32
%u32 = OpTypeInt 32 0
%uint_2 = OpConstant %u32 2
%uint_1 = OpConstant %u32 1
%v2uint = OpTypeVector %u32 2
%v4float = OpTypeVector %f32 4
%image = OpTypeImage %f32 2D 2 0 1 2 Unknown
%ptr_image = OpTypePointer UniformConstant %image
%10 = OpConstantComposite %v2uint %uint_1 %uint_2
%var_image = OpVariable %ptr_image UniformConstant
%main = OpFunction %void None %func
%main_lab = OpLabel
%18 = OpLoad %image %var_image
%19 = OpImageRead %v4float %18 %10 Sample %uint_2
OpReturn
OpFunctionEnd
)";
const spv_target_env env = SPV_ENV_VULKAN_1_0;
CompileSuccessfully(code, env);
ASSERT_EQ(SPV_SUCCESS, ValidateInstructions(env));
EXPECT_THAT(getDiagnosticString(), Eq(""));
}
TEST_F(ValidateImage, ImageMSArray_ArrayedTypeDoesNotRequireCapability) {
const std::string code = R"(
OpCapability Shader
OpCapability StorageImageReadWithoutFormat
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %main "main"
OpExecutionMode %main OriginUpperLeft
OpDecorate %var_image DescriptorSet 0
OpDecorate %var_image Binding 1
%void = OpTypeVoid
%func = OpTypeFunction %void
%f32 = OpTypeFloat 32
%u32 = OpTypeInt 32 0
%uint_3 = OpConstant %u32 3
%uint_2 = OpConstant %u32 2
%uint_1 = OpConstant %u32 1
%v3uint = OpTypeVector %u32 3
%v4float = OpTypeVector %f32 4
%image = OpTypeImage %f32 2D 2 1 0 2 Unknown
%ptr_image = OpTypePointer UniformConstant %image
%10 = OpConstantComposite %v3uint %uint_1 %uint_2 %uint_3
%var_image = OpVariable %ptr_image UniformConstant
%main = OpFunction %void None %func
%main_lab = OpLabel
%18 = OpLoad %image %var_image
%19 = OpImageRead %v4float %18 %10
OpReturn
OpFunctionEnd
)";
const spv_target_env env = SPV_ENV_VULKAN_1_0;
CompileSuccessfully(code, env);
ASSERT_EQ(SPV_SUCCESS, ValidateInstructions(env));
EXPECT_THAT(getDiagnosticString(), Eq(""));
}
} // namespace
} // namespace val
} // namespace spvtools