encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

validation: Allow storage atomics without structs 

Fixed: tint:1409
Change-Id: I169fe23ff697e5c997742caba8a37a54867cd3f6
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/85526
Reviewed-by: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
This commit is contained in:
James Price 2022-04-05 21:01:09 +00:00
parent e6c7fd7110
commit 12f2f9b1bc
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tint/resolver/atomics_validation_test.cc
View File

@ -34,6 +34,14 @@ TEST_F(ResolverAtomicValidationTest, StorageClass_WorkGroup) {
} }
TEST_F(ResolverAtomicValidationTest, StorageClass_Storage) { TEST_F(ResolverAtomicValidationTest, StorageClass_Storage) {
Global("g", ty.atomic(Source{{12, 34}}, ty.i32()),
ast::StorageClass::kStorage, ast::Access::kReadWrite,
GroupAndBinding(0, 0));
EXPECT_TRUE(r()->Resolve()) << r()->error();
}
TEST_F(ResolverAtomicValidationTest, StorageClass_Storage_Struct) {
auto* s = auto* s =
Structure("s", {Member("a", ty.atomic(Source{{12, 34}}, ty.i32()))}); Structure("s", {Member("a", ty.atomic(Source{{12, 34}}, ty.i32()))});
Global("g", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite, Global("g", ty.Of(s), ast::StorageClass::kStorage, ast::Access::kReadWrite,

3
src/tint/resolver/resolver_validation.cc
View File

@ -517,7 +517,8 @@ bool Resolver::ValidateAtomicVariable(const sem::Variable* var) {
auto source = decl->type ? decl->type->source : decl->source; auto source = decl->type ? decl->type->source : decl->source;
if (type->Is<sem::Atomic>()) { if (type->Is<sem::Atomic>()) {
if (sc != ast::StorageClass::kWorkgroup) { if (sc != ast::StorageClass::kWorkgroup &&
sc != ast::StorageClass::kStorage) {
AddError( AddError(
"atomic variables must have <storage> or <workgroup> storage class", "atomic variables must have <storage> or <workgroup> storage class",
source); source);