mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-07-08 14:15:58 +00:00
To declare a local variable, we write `var name : type`, not `var<function> name : type`. This change fixes all the places where we were feeding StorageClass::kFunction into variable declarations. Note that the resolved, semantic variable correctly infers the `kFunction` StorageClass. Change-Id: I6221fabae1de0435044f29b9a91808421d5cace6 Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/50821 Commit-Queue: Ben Clayton <bclayton@chromium.org> Commit-Queue: David Neto <dneto@google.com> Auto-Submit: Ben Clayton <bclayton@google.com> Kokoro: Kokoro <noreply+kokoro@google.com> Reviewed-by: David Neto <dneto@google.com>
69 lines
2.0 KiB
C++
69 lines
2.0 KiB
C++
// Copyright 2020 The Tint Authors.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
#include "src/writer/spirv/spv_dump.h"
|
|
#include "src/writer/spirv/test_helper.h"
|
|
|
|
namespace tint {
|
|
namespace writer {
|
|
namespace spirv {
|
|
namespace {
|
|
|
|
using BuilderTest = TestHelper;
|
|
|
|
// TODO(amaiorano): Disabled because Resolver now emits "redeclared identifier
|
|
// 'var'".
|
|
TEST_F(BuilderTest, DISABLED_Block) {
|
|
// Note, this test uses shadow variables which aren't allowed in WGSL but
|
|
// serves to prove the block code is pushing new scopes as needed.
|
|
auto* inner = Block(Decl(Var("var", ty.f32(), ast::StorageClass::kNone)),
|
|
Assign("var", 2.f));
|
|
auto* outer = Block(Decl(Var("var", ty.f32(), ast::StorageClass::kNone)),
|
|
Assign("var", 1.f), inner, Assign("var", 3.f));
|
|
|
|
WrapInFunction(outer);
|
|
|
|
spirv::Builder& b = Build();
|
|
|
|
b.push_function(Function{});
|
|
ASSERT_FALSE(b.has_error()) << b.error();
|
|
|
|
EXPECT_TRUE(b.GenerateStatement(outer)) << b.error();
|
|
EXPECT_FALSE(b.has_error());
|
|
|
|
EXPECT_EQ(DumpInstructions(b.types()), R"(%3 = OpTypeFloat 32
|
|
%2 = OpTypePointer Function %3
|
|
%4 = OpConstantNull %3
|
|
%5 = OpConstant %3 1
|
|
%7 = OpConstant %3 2
|
|
%8 = OpConstant %3 3
|
|
)");
|
|
|
|
EXPECT_EQ(DumpInstructions(b.functions()[0].variables()),
|
|
R"(%1 = OpVariable %2 Function %4
|
|
%6 = OpVariable %2 Function %4
|
|
)");
|
|
|
|
EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()),
|
|
R"(OpStore %1 %5
|
|
OpStore %6 %7
|
|
OpStore %1 %8
|
|
)");
|
|
}
|
|
|
|
} // namespace
|
|
} // namespace spirv
|
|
} // namespace writer
|
|
} // namespace tint
|