Nikolay Sivov : vkd3d-shader/tpf: Write 'continue' instruction.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: c5414fa92f8aecdb9b60e6cfe76e29387e00b88d
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/c5414fa92f8aecdb9b60e6cfe76e29...

Author: Nikolay Sivov 
Date:   Mon Sep 25 20:44:05 2023 +0200

vkd3d-shader/tpf: Write 'continue' instruction.

Signed-off-by: Nikolay Sivov

---

libs/vkd3d-shader/tpf.c     |  4 ++++
 tests/hlsl/for.shader_test  |  4 ++--
 tests/hlsl/loop.shader_test | 12 ++++++------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c
index fb0bbdaa..d03b0aca 100644
--- a/libs/vkd3d-shader/tpf.c
+++ b/libs/vkd3d-shader/tpf.c
@@ -5200,6 +5200,10 @@ static void write_sm4_jump(const struct tpf_writer *tpf, const struct hlsl_ir_ju
             instr.opcode = VKD3D_SM4_OP_BREAK;
             break;

+        case HLSL_IR_JUMP_CONTINUE:
+            instr.opcode = VKD3D_SM4_OP_CONTINUE;
+            break;
+
         case HLSL_IR_JUMP_DISCARD_NZ:
         {
             instr.opcode = VKD3D_SM4_OP_DISCARD | VKD3D_SM4_CONDITIONAL_NZ;
diff --git a/tests/hlsl/for.shader_test b/tests/hlsl/for.shader_test
index beb521e7..e0b0edc1 100644
--- a/tests/hlsl/for.shader_test
+++ b/tests/hlsl/for.shader_test
@@ -4,7 +4,7 @@ void main(out float tex : texcoord, inout float4 pos : sv_position)
     tex = pos.x;
 }

-[pixel shader todo]
+[pixel shader]
 float4 main(float tex : texcoord) : sv_target
 {
     int i;
@@ -22,7 +22,7 @@ float4 main(float tex : texcoord) : sv_target
 }

[test]
-todo draw quad
+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)
diff --git a/tests/hlsl/loop.shader_test b/tests/hlsl/loop.shader_test
index 9f8bcb92..bf26b69c 100644
--- a/tests/hlsl/loop.shader_test
+++ b/tests/hlsl/loop.shader_test
@@ -42,7 +42,7 @@ uniform 0 float 4.0
 draw quad
 probe all rgba (20.0, 20.0, 20.0, 20.0)

-[pixel shader todo]
+[pixel shader]
 float a;

float4 main() : sv_target
@@ -68,10 +68,10 @@ float4 main() : sv_target

[test]
 uniform 0 float 4.0
-todo draw quad
-todo probe all rgba (409.1, 409.1, 409.1, 409.1)
+draw quad
+probe all rgba (409.1, 409.1, 409.1, 409.1)

-[pixel shader todo]
+[pixel shader]
 float a;

float4 main() : sv_target
@@ -98,5 +98,5 @@ float4 main() : sv_target

[test]
 uniform 0 float 4.0
-todo draw quad
-todo probe all rgba (410.1, 410.1, 410.1, 410.1)
+draw quad
+probe all rgba (410.1, 410.1, 410.1, 410.1)