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

Allow NonWritable to target struct members. (#2420)

Browse Source 
It should be allowed for the NonWritable decoration to be applied to
structure type members.
This commit is contained in:
Ehsan 2019-02-27 16:11:50 -05:00 committed by GitHub
parent 32b0f6739f
commit 5fb83a9708
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/val/validate_decorations.cpp
View File

@ -1269,17 +1269,6 @@ spv_result_t CheckNonWritableDecoration(ValidationState_t& vstate,
<< "Target of NonWritable decoration is invalid: must point to a "
"storage image, uniform block, or storage buffer";
}
} else {
// The target is a struct member. The annotations pass already checks that
// it is a structure. So now fall through to ensure that the structure is
// used as a UBO or SSBO.
const auto type_id = inst.id();
if (!vstate.IsStructForUniformBlock(type_id) &&
!vstate.IsStructForStorageBuffer(type_id)) {
return vstate.diag(SPV_ERROR_INVALID_ID, &inst)
<< "Target of NonWritable member decoration is invalid: must be "
"the struct type of a uniform block or storage buffer";
}
}
return SPV_SUCCESS;

14
test/val/val_decoration_test.cpp
View File

@ -5743,7 +5743,7 @@ std::string ShaderWithNonWritableTarget(const std::string& target,
OpName %var_imsam "var_imsam"
OpName %var_priv "var_priv"
OpName %var_func "var_func"
OpName %struct_bad "struct_bad"
OpName %simple_struct "simple_struct"
OpDecorate %struct_b Block
OpDecorate %struct_bb BufferBlock
@ -5766,7 +5766,7 @@ std::string ShaderWithNonWritableTarget(const std::string& target,
%struct_bb = OpTypeStruct %float
%rtarr = OpTypeRuntimeArray %float
%struct_b_rtarr = OpTypeStruct %rtarr
%struct_bad = OpTypeStruct %float
%simple_struct = OpTypeStruct %float
; storage image
%imstor = OpTypeImage %float 2D 0 0 0 2 R32f
; sampled image
@ -5932,15 +5932,11 @@ TEST_F(ValidateDecorations, NonWritableMemberOfSsboInStorageBufferGood) {
EXPECT_THAT(getDiagnosticString(), Eq(""));
}
TEST_F(ValidateDecorations, NonWritableMemberOfNonBlockStructBad) {
std::string spirv = ShaderWithNonWritableTarget("%struct_bad", true);
TEST_F(ValidateDecorations, NonWritableMemberOfStructGood) {
std::string spirv = ShaderWithNonWritableTarget("%simple_struct", true);
CompileSuccessfully(spirv);
EXPECT_EQ(SPV_ERROR_INVALID_ID, ValidateInstructions());
EXPECT_THAT(
getDiagnosticString(),
HasSubstr("Target of NonWritable member decoration is invalid: must be "
"the struct type of a uniform block or storage buffer"));
EXPECT_EQ(SPV_SUCCESS, ValidateInstructions());
}
TEST_F(ValidateDecorations, NonWritableVarWorkgroupBad) {