[PATCH 0/4] MR568: vkd3d-shader: Miscellaneous changes in view of the CFG structurizer.

[PATCH 1/4] tests: Add a test with non-trivial control flow.

[Giovanni Mascellani]

From: Giovanni Mascellani

---
 tests/hlsl/for.shader_test | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/tests/hlsl/for.shader_test b/tests/hlsl/for.shader_test
index 9407c81bc..600adfbcf 100644
--- a/tests/hlsl/for.shader_test
+++ b/tests/hlsl/for.shader_test
@@ -28,6 +28,33 @@ probe (  0, 0, 159, 480) rgba (10.0, 35.0, 0.0, 0.0)
 probe (161, 0, 479, 480) rgba (10.0, 38.0, 0.0, 0.0)
 probe (481, 0, 640, 480) rgba ( 5.0, 10.0, 0.0, 0.0)

+% Identical to the previous, except for dirty tricks to prevent DXC from unrolling the loop so we can test non-trivial control flow
+[pixel shader]
+float4 main(float tex : texcoord) : sv_target
+{
+    int i;
+    float x = 0.0;
+    uint iter = 10;
+    if (tex > 1000)
+        iter = tex;
+    for (i = 0; i < iter; i++)
+    {
+        x += i;
+        if (tex > 0.5 && i == 5)
+            break;
+        if (tex > -0.5 && i >= 7)
+            continue;
+        x -= 1;
+    }
+    return float4(i, x, 0.0, 0.0);
+}
+
+[test]
+todo(sm>=6) draw quad
+probe (  0, 0, 159, 480) rgba (10.0, 35.0, 0.0, 0.0)
+probe (161, 0, 479, 480) rgba (10.0, 38.0, 0.0, 0.0)
+probe (481, 0, 640, 480) rgba ( 5.0, 10.0, 0.0, 0.0)
+
 [pixel shader]
 float4 main(float tex : texcoord) : sv_target
 {

[PATCH 2/4] tests: Test a couple of degenerate switch instances.

[Giovanni Mascellani]

From: Giovanni Mascellani

---
 tests/hlsl/switch.shader_test | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/tests/hlsl/switch.shader_test b/tests/hlsl/switch.shader_test
index b7edadccf..01624f97c 100644
--- a/tests/hlsl/switch.shader_test
+++ b/tests/hlsl/switch.shader_test
@@ -28,6 +28,41 @@ uniform 0 uint4 0 0 0 0
 draw quad
 probe all rgba (3.0, 3.0, 3.0, 3.0)

+% just a default case
+[pixel shader]
+uint4 v;
+
+float4 main() : sv_target
+{
+    switch (v.x)
+    {
+    default:
+        return 5.0;
+    }
+}
+
+[test]
+uniform 0 uint4 3 0 0 0
+draw quad
+probe all rgba (5.0, 5.0, 5.0, 5.0)
+uniform 0 uint4 1 0 0 0
+draw quad
+probe all rgba (5.0, 5.0, 5.0, 5.0)
+uniform 0 uint4 0 0 0 0
+draw quad
+probe all rgba (5.0, 5.0, 5.0, 5.0)
+
+% completely empty
+[pixel shader fail]
+uint4 v;
+
+float4 main() : sv_target
+{
+    switch (v.x)
+    {
+    }
+}
+
 % falling through is only supported for empty case statements
 [pixel shader]
 uint4 v;

[PATCH 3/4] vkd3d-shader/spirv: Normalise the shader before allocating registers.

[Giovanni Mascellani]

From: Giovanni Mascellani

---
 libs/vkd3d-shader/spirv.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 067ba1b2d..2b9208f8a 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -9953,6 +9953,9 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler,
     enum vkd3d_result result = VKD3D_OK;
     unsigned int i;

+    if ((result = vkd3d_shader_normalise(parser, compile_info)) < 0)
+        return result;
+
     if (parser->shader_desc.temp_count)
         spirv_compiler_emit_temps(compiler, parser->shader_desc.temp_count);
     if (parser->shader_desc.ssa_count)
@@ -9963,9 +9966,6 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler,
     compiler->location.column = 0;
     compiler->location.line = 1;

-    if ((result = vkd3d_shader_normalise(parser, compile_info)) < 0)
-        return result;
-
     instructions = parser->instructions;
     memset(&parser->instructions, 0, sizeof(parser->instructions));

[PATCH 4/4] vkd3d-shader: Make relative address sources mutable too.

[Giovanni Mascellani]

From: Giovanni Mascellani

They were forgotten in 78d95889bd49c6028f0c26aaec5589786381da4a.

Fixes: 78d95889bd49c6028f0c26aaec5589786381da4a
---
 libs/vkd3d-shader/d3dbc.c                | 4 ++--
 libs/vkd3d-shader/vkd3d_shader_private.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c
index aa0dd8f4b..dcd510355 100644
--- a/libs/vkd3d-shader/d3dbc.c
+++ b/libs/vkd3d-shader/d3dbc.c
@@ -444,7 +444,7 @@ static uint32_t swizzle_from_sm1(uint32_t swizzle)
             shader_sm1_get_swizzle_component(swizzle, 3));
 }

-static void shader_sm1_parse_src_param(uint32_t param, const struct vkd3d_shader_src_param *rel_addr,
+static void shader_sm1_parse_src_param(uint32_t param, struct vkd3d_shader_src_param *rel_addr,
         struct vkd3d_shader_src_param *src)
 {
     enum vkd3d_shader_register_type reg_type = ((param & VKD3D_SM1_REGISTER_TYPE_MASK) >> VKD3D_SM1_REGISTER_TYPE_SHIFT)
@@ -465,7 +465,7 @@ static void shader_sm1_parse_src_param(uint32_t param, const struct vkd3d_shader
     src->modifiers = (param & VKD3D_SM1_SRC_MODIFIER_MASK) >> VKD3D_SM1_SRC_MODIFIER_SHIFT;
 }

-static void shader_sm1_parse_dst_param(uint32_t param, const struct vkd3d_shader_src_param *rel_addr,
+static void shader_sm1_parse_dst_param(uint32_t param, struct vkd3d_shader_src_param *rel_addr,
         struct vkd3d_shader_dst_param *dst)
 {
     enum vkd3d_shader_register_type reg_type = ((param & VKD3D_SM1_REGISTER_TYPE_MASK) >> VKD3D_SM1_REGISTER_TYPE_SHIFT)
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index b85441aeb..6cf8c4cf4 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -823,7 +823,7 @@ struct vkd3d_shader_indexable_temp

struct vkd3d_shader_register_index
 {
-    const struct vkd3d_shader_src_param *rel_addr;
+    struct vkd3d_shader_src_param *rel_addr;
     unsigned int offset;
     /* address is known to fall within the object (for optimisation) */
     bool is_in_bounds;

[Zebediah Figura (＠zfigura)]

Would a less dirty trick just be to pass the loop limit as a uniform?