openharmony/third_party_spirv-tools
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_spirv-tools.git synced 2026-07-21 03:35:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

spirv-val: Add Vulkan image gather offset VUID (#4118)

Browse Source
This commit is contained in:
sfricke-samsung
2021-01-27 16:37:45 -08:00
committed by GitHub
parent e1e99e9d28
commit 85dd3ccc82
3 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/val/validate_image.cpp
+11
View File
@@ -441,6 +441,17 @@ spv_result_t ValidateImageOperands(ValidationState_t& _,
<< "Expected Image Operand Offset to have " << plane_size
<< " components, but given " << offset_size;
}
if (spvIsVulkanEnv(_.context()->target_env)) {
if (opcode != SpvOpImageGather && opcode != SpvOpImageDrefGather &&
opcode != SpvOpImageSparseGather &&
opcode != SpvOpImageSparseDrefGather) {
return _.diag(SPV_ERROR_INVALID_DATA, inst)
<< _.VkErrorID(4663)
<< "Image Operand Offset can only be used with "
"OpImage*Gather operations";
}
}
}
if (mask & SpvImageOperandsConstOffsetsMask) {
source/val/validation_state.cpp
+2
View File
@@ -1700,6 +1700,8 @@ std::string ValidationState_t::VkErrorID(uint32_t id,
return VUID_WRAP(VUID-StandaloneSpirv-OpImageTexelPointer-04658);
case 4662:
return VUID_WRAP(VUID-StandaloneSpirv-Offset-04662);
case 4663:
return VUID_WRAP(VUID-StandaloneSpirv-Offset-04663);
case 4669:
return VUID_WRAP(VUID-StandaloneSpirv-GLSLShared-04669);
case 4675:
test/val/val_image_test.cpp
+18
View File
@@ -1767,6 +1767,24 @@ TEST_F(ValidateImage, SampleImplicitLodOffsetWrongSize) {
"Expected Image Operand Offset to have 2 components, but given 3"));
}
TEST_F(ValidateImage, SampleImplicitLodVulkanOffsetWrongSize) {
const std::string body = R"(
%img = OpLoad %type_image_f32_2d_0001 %uniform_image_f32_2d_0001
%sampler = OpLoad %type_sampler %uniform_sampler
%simg = OpSampledImage %type_sampled_image_f32_2d_0001 %img %sampler
%res4 = OpImageSampleImplicitLod %f32vec4 %simg %f32vec4_0000 Offset %s32vec2_01
)";
CompileSuccessfully(
GenerateShaderCode(body, "", "Fragment", "", SPV_ENV_VULKAN_1_0).c_str());
ASSERT_EQ(SPV_ERROR_INVALID_DATA, ValidateInstructions(SPV_ENV_VULKAN_1_0));
EXPECT_THAT(getDiagnosticString(),
AnyVUID("VUID-StandaloneSpirv-Offset-04663"));
EXPECT_THAT(getDiagnosticString(),
HasSubstr("Image Operand Offset can only be used with "
"OpImage*Gather operations"));
}
TEST_F(ValidateImage, SampleImplicitLodMoreThanOneOffset) {
const std::string body = R"(
%img = OpLoad %type_image_f32_2d_0001 %uniform_image_f32_2d_0001