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

writer/hlsl: Initialize output local variable 

Failing to initialize this can lead to uninitialized variable errors in the FXC compiler.

Change-Id: Ic4e7ee0aab889241923382f83058e3a9a567be5b
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/46265
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: James Price <jrprice@google.com>
This commit is contained in:
Ben Clayton 2021-03-29 21:27:05 +00:00 committed by Commit Bot service account
parent 92b5be0047
commit 02571d15e8
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/writer/hlsl/generator_impl.cc
View File

@ -1891,8 +1891,8 @@ bool GeneratorImpl::EmitEntryPointFunction(std::ostream& out,
if (has_outdata) { if (has_outdata) {
make_indent(out); make_indent(out);
out << outdata->second.struct_name << " " << outdata->second.var_name << ";" out << outdata->second.struct_name << " " << outdata->second.var_name
<< std::endl; << " = (" << outdata->second.struct_name << ")0;" << std::endl;
} }
generating_entry_point_ = true; generating_entry_point_ = true;

14
src/writer/hlsl/generator_impl_function_test.cc
View File

@ -140,7 +140,7 @@ struct main_out {
}; };
main_out main(tint_symbol_2 tint_symbol_3) { main_out main(tint_symbol_2 tint_symbol_3) {
main_out tint_out; main_out tint_out = (main_out)0;
const float foo = tint_symbol_3.foo; const float foo = tint_symbol_3.foo;
tint_out.bar = foo; tint_out.bar = foo;
return tint_out; return tint_out;
@ -183,7 +183,7 @@ struct frag_main_out {
}; };
frag_main_out frag_main(tint_symbol_2 tint_symbol_3) { frag_main_out frag_main(tint_symbol_2 tint_symbol_3) {
frag_main_out tint_out; frag_main_out tint_out = (frag_main_out)0;
const float foo = tint_symbol_3.foo; const float foo = tint_symbol_3.foo;
tint_out.bar = foo; tint_out.bar = foo;
return tint_out; return tint_out;
@ -228,7 +228,7 @@ struct frag_main_out {
}; };
frag_main_out frag_main(tint_symbol_2 tint_symbol_3) { frag_main_out frag_main(tint_symbol_2 tint_symbol_3) {
frag_main_out tint_out; frag_main_out tint_out = (frag_main_out)0;
const float4 coord = tint_symbol_3.coord; const float4 coord = tint_symbol_3.coord;
tint_out.depth = coord.x; tint_out.depth = coord.x;
return tint_out; return tint_out;
@ -522,7 +522,7 @@ float sub_func_ep_1(out ep_1_out tint_out, float param, float foo) {
} }
ep_1_out ep_1(tint_symbol_2 tint_symbol_3) { ep_1_out ep_1(tint_symbol_2 tint_symbol_3) {
ep_1_out tint_out; ep_1_out tint_out = (ep_1_out)0;
const float foo = tint_symbol_3.foo; const float foo = tint_symbol_3.foo;
tint_out.bar = sub_func_ep_1(tint_out, 1.0f, foo); tint_out.bar = sub_func_ep_1(tint_out, 1.0f, foo);
return tint_out; return tint_out;
@ -568,7 +568,7 @@ float sub_func(float param) {
} }
ep_1_out ep_1() { ep_1_out ep_1() {
ep_1_out tint_out; ep_1_out tint_out = (ep_1_out)0;
tint_out.depth = sub_func(1.0f); tint_out.depth = sub_func(1.0f);
return tint_out; return tint_out;
} }
@ -630,7 +630,7 @@ float sub_func_ep_1(out ep_1_out tint_out, float param, float4 coord) {
} }
ep_1_out ep_1(tint_symbol_2 tint_symbol_3) { ep_1_out ep_1(tint_symbol_2 tint_symbol_3) {
ep_1_out tint_out; ep_1_out tint_out = (ep_1_out)0;
const float4 coord = tint_symbol_3.coord; const float4 coord = tint_symbol_3.coord;
tint_out.depth = sub_func_ep_1(tint_out, 1.0f, coord); tint_out.depth = sub_func_ep_1(tint_out, 1.0f, coord);
return tint_out; return tint_out;
@ -763,7 +763,7 @@ TEST_F(HlslGeneratorImplTest_Function,
}; };
ep_1_out ep_1() { ep_1_out ep_1() {
ep_1_out tint_out; ep_1_out tint_out = (ep_1_out)0;
tint_out.bar = 1.0f; tint_out.bar = 1.0f;
if ((1 == 1)) { if ((1 == 1)) {
return tint_out; return tint_out;