[PATCH 2/6] vkd3d-shader/spirv: Do not normalise Shader Model 6 shaders.

[Conor McCarthy]

From: Conor McCarthy

---
 libs/vkd3d-shader/spirv.c | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 9725a5c7..8cd2f74e 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -2228,6 +2228,7 @@ struct spirv_compiler
     uint32_t sample_positions_id;

enum vkd3d_shader_type shader_type;
+    bool is_dxil;

unsigned int branch_id;
     unsigned int loop_id;
@@ -2428,6 +2429,7 @@ static struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_ve
     rb_init(&compiler->symbol_table, vkd3d_symbol_compare);

compiler->shader_type = shader_version->type;
+    compiler->is_dxil = shader_version->major >= 6;

compiler->input_signature = shader_desc->input_signature;
     compiler->output_signature = shader_desc->output_signature;
@@ -9456,18 +9458,21 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler,
     instructions = parser->instructions;
     memset(&parser->instructions, 0, sizeof(parser->instructions));

-    if (compiler->shader_type == VKD3D_SHADER_TYPE_HULL
-            && (result = instruction_array_flatten_hull_shader_phases(&instructions)) >= 0)
+    if (!compiler->is_dxil)
     {
-        result = instruction_array_normalise_hull_shader_control_point_io(&instructions,
-                &compiler->input_signature);
-    }
-    if (result >= 0)
-        result = instruction_array_normalise_io_registers(&instructions, parser->shader_version.type,
-                &compiler->input_signature, &compiler->output_signature, &compiler->patch_constant_signature);
+        if (compiler->shader_type == VKD3D_SHADER_TYPE_HULL
+                && (result = instruction_array_flatten_hull_shader_phases(&instructions)) >= 0)
+        {
+            result = instruction_array_normalise_hull_shader_control_point_io(&instructions,
+                    &compiler->input_signature);
+        }
+        if (result >= 0)
+            result = instruction_array_normalise_io_registers(&instructions, parser->shader_version.type,
+                    &compiler->input_signature, &compiler->output_signature, &compiler->patch_constant_signature);

-    if (result >= 0 && TRACE_ON())
-        vkd3d_shader_trace(&instructions, &parser->shader_version);
+        if (result >= 0 && TRACE_ON())
+            vkd3d_shader_trace(&instructions, &parser->shader_version);
+    }

if (compiler->shader_type != VKD3D_SHADER_TYPE_HULL)
         spirv_compiler_emit_shader_signature_outputs(compiler);