encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-07-04 20:25:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues with BUILD.gn

Browse Source 
Couple of little style issues, and a path to a file that was incorrect.

Change-Id: I21d1a4ca41bc36163602378086989ac712f54469
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/25265
Reviewed-by: dan sinclair <dsinclair@chromium.org>
This commit is contained in:
Ryan Harrison 2020-07-20 19:54:23 +00:00 committed by dan sinclair
parent 18c85f52e4
commit c8af502c01
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD.gn
View File

@ -904,7 +904,6 @@ source_set("tint_unittests_wgsl_writer_src") {
"src/writer/wgsl/generator_impl_kill_test.cc", "src/writer/wgsl/generator_impl_kill_test.cc",
"src/writer/wgsl/generator_impl_loop_test.cc", "src/writer/wgsl/generator_impl_loop_test.cc",
"src/writer/wgsl/generator_impl_member_accessor_test.cc", "src/writer/wgsl/generator_impl_member_accessor_test.cc",
"src/writer/wgsl/generator_impl_module_constant_test.cc",
"src/writer/wgsl/generator_impl_return_test.cc", "src/writer/wgsl/generator_impl_return_test.cc",
"src/writer/wgsl/generator_impl_switch_test.cc", "src/writer/wgsl/generator_impl_switch_test.cc",
"src/writer/wgsl/generator_impl_test.cc", "src/writer/wgsl/generator_impl_test.cc",
@ -953,6 +952,7 @@ source_set("tint_unittests_msl_writer_src") {
"src/writer/msl/generator_impl_kill_test.cc", "src/writer/msl/generator_impl_kill_test.cc",
"src/writer/msl/generator_impl_loop_test.cc", "src/writer/msl/generator_impl_loop_test.cc",
"src/writer/msl/generator_impl_member_accessor_test.cc", "src/writer/msl/generator_impl_member_accessor_test.cc",
"src/writer/msl/generator_impl_module_constant_test.cc",
"src/writer/msl/generator_impl_return_test.cc", "src/writer/msl/generator_impl_return_test.cc",
"src/writer/msl/generator_impl_switch_test.cc", "src/writer/msl/generator_impl_switch_test.cc",
"src/writer/msl/generator_impl_test.cc", "src/writer/msl/generator_impl_test.cc",

4
src/ast/function_test.cc
View File

@ -119,9 +119,9 @@ TEST_F(FunctionTest, GetReferenceLocations) {
auto ref_locs = f.referenced_location_variables(); auto ref_locs = f.referenced_location_variables();
ASSERT_EQ(ref_locs.size(), 2u); ASSERT_EQ(ref_locs.size(), 2u);
EXPECT_EQ(ref_locs[0].first, &loc1); EXPECT_EQ(ref_locs[0].first, &loc1);
EXPECT_EQ(ref_locs[0].second->value(), 0); EXPECT_EQ(ref_locs[0].second->value(), 0u);
EXPECT_EQ(ref_locs[1].first, &loc2); EXPECT_EQ(ref_locs[1].first, &loc2);
EXPECT_EQ(ref_locs[1].second->value(), 1); EXPECT_EQ(ref_locs[1].second->value(), 1u);
} }
TEST_F(FunctionTest, GetReferenceBuiltins) { TEST_F(FunctionTest, GetReferenceBuiltins) {

12
src/writer/msl/generator_impl.cc
View File

@ -651,8 +651,8 @@ bool GeneratorImpl::EmitEntryPointData(ast::EntryPoint* ep) {
std::vector<std::pair<ast::Variable*, ast::VariableDecoration*>> std::vector<std::pair<ast::Variable*, ast::VariableDecoration*>>
out_variables; out_variables;
for (auto data : func->referenced_location_variables()) { for (auto data : func->referenced_location_variables()) {
auto var = data.first; auto* var = data.first;
auto deco = data.second; auto* deco = data.second;
if (var->storage_class() == ast::StorageClass::kInput) { if (var->storage_class() == ast::StorageClass::kInput) {
in_locations.push_back({var, deco->value()}); in_locations.push_back({var, deco->value()});
@ -662,8 +662,8 @@ bool GeneratorImpl::EmitEntryPointData(ast::EntryPoint* ep) {
} }
for (auto data : func->referenced_builtin_variables()) { for (auto data : func->referenced_builtin_variables()) {
auto var = data.first; auto* var = data.first;
auto deco = data.second; auto* deco = data.second;
if (var->storage_class() == ast::StorageClass::kOutput) { if (var->storage_class() == ast::StorageClass::kOutput) {
out_variables.push_back({var, deco}); out_variables.push_back({var, deco});
@ -819,7 +819,7 @@ void GeneratorImpl::EmitStage(ast::PipelineStage stage) {
bool GeneratorImpl::has_referenced_var_needing_struct(ast::Function* func) { bool GeneratorImpl::has_referenced_var_needing_struct(ast::Function* func) {
for (auto data : func->referenced_location_variables()) { for (auto data : func->referenced_location_variables()) {
auto var = data.first; auto* var = data.first;
if (var->storage_class() == ast::StorageClass::kInput || if (var->storage_class() == ast::StorageClass::kInput ||
var->storage_class() == ast::StorageClass::kOutput) { var->storage_class() == ast::StorageClass::kOutput) {
return true; return true;
@ -827,7 +827,7 @@ bool GeneratorImpl::has_referenced_var_needing_struct(ast::Function* func) {
} }
for (auto data : func->referenced_builtin_variables()) { for (auto data : func->referenced_builtin_variables()) {
auto var = data.first; auto* var = data.first;
if (var->storage_class() == ast::StorageClass::kOutput) { if (var->storage_class() == ast::StorageClass::kOutput) {
return true; return true;
} }