commit c8c10e83dfc2d4f62d72848b2c95de12790bc899
author David Neto <dneto@google.com> Fri May 01 19:09:08 2020 +0000
committer dan sinclair <dsinclair@google.com> Fri May 01 19:09:08 2020 +0000
tree b6a1e4d2d40a55e01bcbac3f67e0068db1c8910f
parent de4259ef804ceb579f7f1fc9b1960f081173766f

[spirv-writer] Generate load for var initializer, if needed

Change-Id: I609860bb05fae3e6e5eb21a471f869030f384ad0
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/20721
Reviewed-by: dan sinclair <dsinclair@google.com>

src/writer/spirv/builder.cc

diff --git a/src/writer/spirv/builder.cc b/src/writer/spirv/builder.cc
index 680abd3..a8eaa1d 100644
--- a/src/writer/spirv/builder.cc
+++ b/src/writer/spirv/builder.cc
@@ -416,6 +416,7 @@
   push_function_var(
       {Operand::Int(type_id), result, Operand::Int(ConvertStorageClass(sc))});
   if (var->has_constructor()) {
+    init_id = GenerateLoadIfNeeded(var->constructor()->result_type(), init_id);
     GenerateStore(var_id, init_id);
   }
 

src/writer/spirv/builder_function_variable_test.cc

diff --git a/src/writer/spirv/builder_function_variable_test.cc b/src/writer/spirv/builder_function_variable_test.cc
index d4e8513..0917616 100644
--- a/src/writer/spirv/builder_function_variable_test.cc
+++ b/src/writer/spirv/builder_function_variable_test.cc
@@ -158,6 +158,15 @@
 )");
 }
 
+TEST_F(BuilderTest,
+       DISABLED_FunctionVar_WithNonConstantConstructorLoadedFromVar) {
+  // fn main() -> void {
+  //   var v : f32 = 1.0;
+  //   var v2 : f32 = v; // Should generate the load automatically.
+  // }
+  FAIL();
+}
+
 TEST_F(BuilderTest, FunctionVar_Const) {
   ast::type::F32Type f32;
   ast::type::VectorType vec(&f32, 3);