AuroraMiddleware/SPIRV-Cross-Vulnerable
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Cross.git synced 2024-11-15 00:11:06 +00:00
Code Issues Projects Releases Wiki Activity

Run format.sh.

Browse Source
This commit is contained in:
Hans-Kristian Arntzen 2017-03-07 16:29:48 +01:00
parent 447545311b
commit 3eed439643
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
spirv_hlsl.cpp
View File

@ -508,8 +508,7 @@ void CompilerHLSL::emit_resources()
// Do not emit I/O blocks here. // Do not emit I/O blocks here.
// I/O blocks can be arrayed, so we must deal with them separately to support geometry shaders // I/O blocks can be arrayed, so we must deal with them separately to support geometry shaders
// and tessellation down the line. // and tessellation down the line.
if (!block && !var.remapped_variable && type.pointer && if (!block && !var.remapped_variable && type.pointer && !is_builtin_variable(var) &&
!is_builtin_variable(var) &&
interface_variable_exists_in_entry_point(var.self)) interface_variable_exists_in_entry_point(var.self))
{ {
if (var.storage == StorageClassInput) if (var.storage == StorageClassInput)
@ -549,8 +548,7 @@ void CompilerHLSL::emit_resources()
if (has_location_a && has_location_b) if (has_location_a && has_location_b)
{ {
return get_decoration(a->self, DecorationLocation) < return get_decoration(a->self, DecorationLocation) < get_decoration(b->self, DecorationLocation);
get_decoration(b->self, DecorationLocation);
} }
else if (has_location_a && !has_location_b) else if (has_location_a && !has_location_b)
return true; return true;
@ -731,8 +729,7 @@ void CompilerHLSL::emit_hlsl_entry_point()
if (var.storage != StorageClassInput && var.storage != StorageClassOutput) if (var.storage != StorageClassInput && var.storage != StorageClassOutput)
continue; continue;
if (block && !is_builtin_variable(var) && if (block && !is_builtin_variable(var) && interface_variable_exists_in_entry_point(var.self))
interface_variable_exists_in_entry_point(var.self))
{ {
if (var.storage == StorageClassInput) if (var.storage == StorageClassInput)
{ {
@ -794,8 +791,7 @@ void CompilerHLSL::emit_hlsl_entry_point()
if (var.storage != StorageClassInput) if (var.storage != StorageClassInput)
continue; continue;
if (!block && !var.remapped_variable && type.pointer && if (!block && !var.remapped_variable && type.pointer && !is_builtin_variable(var) &&
!is_builtin_variable(var) &&
interface_variable_exists_in_entry_point(var.self)) interface_variable_exists_in_entry_point(var.self))
{ {
auto name = to_name(var.self); auto name = to_name(var.self);
@ -813,8 +809,7 @@ void CompilerHLSL::emit_hlsl_entry_point()
} }
// I/O blocks don't use the common stage input/output struct, but separate outputs. // I/O blocks don't use the common stage input/output struct, but separate outputs.
if (block && !is_builtin_variable(var) && if (block && !is_builtin_variable(var) && interface_variable_exists_in_entry_point(var.self))
interface_variable_exists_in_entry_point(var.self))
{ {
auto name = to_name(var.self); auto name = to_name(var.self);
statement(name, " = stage_input", name, ";"); statement(name, " = stage_input", name, ";");
@ -843,8 +838,7 @@ void CompilerHLSL::emit_hlsl_entry_point()
continue; continue;
// I/O blocks don't use the common stage input/output struct, but separate outputs. // I/O blocks don't use the common stage input/output struct, but separate outputs.
if (block && !is_builtin_variable(var) && if (block && !is_builtin_variable(var) && interface_variable_exists_in_entry_point(var.self))
interface_variable_exists_in_entry_point(var.self))
{ {
auto name = to_name(var.self); auto name = to_name(var.self);
statement("stage_output", name, " = ", name, ";"); statement("stage_output", name, " = ", name, ";");
@ -879,8 +873,7 @@ void CompilerHLSL::emit_hlsl_entry_point()
continue; continue;
if (!block && var.storage != StorageClassFunction && !var.remapped_variable && type.pointer && if (!block && var.storage != StorageClassFunction && !var.remapped_variable && type.pointer &&
!is_builtin_variable(var) && !is_builtin_variable(var) && interface_variable_exists_in_entry_point(var.self))
interface_variable_exists_in_entry_point(var.self))
{ {
auto name = to_name(var.self); auto name = to_name(var.self);
statement("stage_output.", name, " = ", name, ";"); statement("stage_output.", name, " = ", name, ";");