encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-21 10:49:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

[spirv-reader] Remove support for NumWorkgroups builtin variable

Browse Source 
It was removed from WGSL MVP
https://github.com/gpuweb/gpuweb/issues/920

Bug: tint:3
Change-Id: I94a584feec88dda7e310ee5d7fa01e93e26cd31d
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/25526
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
This commit is contained in:
David Neto
2020-08-05 21:16:59 +00:00
parent b77399cbad
commit 6eb2a85adf
10 changed files with 6 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/reader/spirv/enum_converter.cc
View File

@@ -80,8 +80,6 @@ ast::Builtin EnumConverter::ToBuiltin(SpvBuiltIn b) {
return ast::Builtin::kFragCoord;
case SpvBuiltInFragDepth:
return ast::Builtin::kFragDepth;
case SpvBuiltInNumWorkgroups:
return ast::Builtin::kNumWorkgroups;
case SpvBuiltInWorkgroupSize:
return ast::Builtin::kWorkgroupSize;
case SpvBuiltInLocalInvocationId:

13
src/reader/spirv/enum_converter_test.cc
View File

@@ -215,8 +215,6 @@ INSTANTIATE_TEST_SUITE_P(
BuiltinCase{SpvBuiltInFrontFacing, true, ast::Builtin::kFrontFacing},
BuiltinCase{SpvBuiltInFragCoord, true, ast::Builtin::kFragCoord},
BuiltinCase{SpvBuiltInFragDepth, true, ast::Builtin::kFragDepth},
BuiltinCase{SpvBuiltInNumWorkgroups, true,
ast::Builtin::kNumWorkgroups},
BuiltinCase{SpvBuiltInWorkgroupSize, true,
ast::Builtin::kWorkgroupSize},
BuiltinCase{SpvBuiltInLocalInvocationId, true,
@@ -226,11 +224,12 @@ INSTANTIATE_TEST_SUITE_P(
BuiltinCase{SpvBuiltInGlobalInvocationId, true,
ast::Builtin::kGlobalInvocationId}));
INSTANTIATE_TEST_SUITE_P(EnumConverterBad,
SpvBuiltinTest,
testing::Values(BuiltinCase{
static_cast<SpvBuiltIn>(9999), false,
ast::Builtin::kNone}));
INSTANTIATE_TEST_SUITE_P(
EnumConverterBad,
SpvBuiltinTest,
testing::Values(
BuiltinCase{static_cast<SpvBuiltIn>(9999), false, ast::Builtin::kNone},
BuiltinCase{SpvBuiltInNumWorkgroups, false, ast::Builtin::kNone}));
} // namespace
} // namespace spirv

3
src/reader/wgsl/parser_impl.cc
View File

@@ -86,9 +86,6 @@ ast::Builtin ident_to_builtin(const std::string& str) {
if (str == "frag_depth") {
return ast::Builtin::kFragDepth;
}
if (str == "num_workgroups") {
return ast::Builtin::kNumWorkgroups;
}
if (str == "workgroup_size") {
return ast::Builtin::kWorkgroupSize;
}

1
src/reader/wgsl/parser_impl_variable_decoration_test.cc
View File

@@ -101,7 +101,6 @@ INSTANTIATE_TEST_SUITE_P(
BuiltinData{"front_facing", ast::Builtin::kFrontFacing},
BuiltinData{"frag_coord", ast::Builtin::kFragCoord},
BuiltinData{"frag_depth", ast::Builtin::kFragDepth},
BuiltinData{"num_workgroups", ast::Builtin::kNumWorkgroups},
BuiltinData{"workgroup_size", ast::Builtin::kWorkgroupSize},
BuiltinData{"local_invocation_id", ast::Builtin::kLocalInvocationId},
BuiltinData{"local_invocation_idx", ast::Builtin::kLocalInvocationIdx},