Zebediah Figura : vkd3d-shader/hlsl: Emit a hlsl_fixme() for unhandled instruction types when writing bytecode.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 6177cea31fcdceaf2111f891dd2336442e4b9a40
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/6177cea31fcdceaf2111f891dd2336...

Author: Zebediah Figura 
Date:   Thu Feb  9 15:26:04 2023 -0600

vkd3d-shader/hlsl: Emit a hlsl_fixme() for unhandled instruction types when writing bytecode.

This was originally left alone in order to allow functions without early return
to succeed, since in that case we would already emit the correct bytecode
despite not handling the HLSL_IR_JUMP_RETURN instruction.

Now that we lower return statements, however, any unhandled instructions are
either definitely going to result in invalid bytecode, or rare enough that it's
not worth returning success anyway.

---

libs/vkd3d-shader/hlsl_sm1.c |  2 +-
 libs/vkd3d-shader/hlsl_sm4.c |  2 +-
 tests/return.shader_test     | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c
index 41b111a5..93e9fd8e 100644
--- a/libs/vkd3d-shader/hlsl_sm1.c
+++ b/libs/vkd3d-shader/hlsl_sm1.c
@@ -919,7 +919,7 @@ static void write_sm1_instructions(struct hlsl_ctx *ctx, struct vkd3d_bytecode_b
                 break;

default:
-                FIXME("Unhandled instruction type %s.\n", hlsl_node_type_to_string(instr->type));
+                hlsl_fixme(ctx, &instr->loc, "Instruction type %s.", hlsl_node_type_to_string(instr->type));
         }
     }
 }
diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c
index fb14889d..69f9b9d3 100644
--- a/libs/vkd3d-shader/hlsl_sm4.c
+++ b/libs/vkd3d-shader/hlsl_sm4.c
@@ -2401,7 +2401,7 @@ static void write_sm4_block(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *
                 break;

default:
-                FIXME("Unhandled instruction type %s.\n", hlsl_node_type_to_string(instr->type));
+                hlsl_fixme(ctx, &instr->loc, "Instruction type %s.", hlsl_node_type_to_string(instr->type));
         }
     }
 }
diff --git a/tests/return.shader_test b/tests/return.shader_test
index 3847765e..a66d8756 100644
--- a/tests/return.shader_test
+++ b/tests/return.shader_test
@@ -146,7 +146,7 @@ void main(out float4 ret : sv_target)
 todo draw quad
 todo probe all rgba (0.2, 0.4, 0.6, 0.8)

-[pixel shader]
+[pixel shader todo]

uniform float f;

@@ -166,23 +166,23 @@ void main(out float4 ret : sv_target)

[test]
 uniform 0 float 0.0
-draw quad
+todo draw quad
 todo probe all rgba (0.1, 0.1, 0.1, 0.1) 1

uniform 0 float 0.1
-draw quad
+todo draw quad
 todo probe all rgba (0.2, 0.2, 0.2, 0.2) 1

uniform 0 float 0.3
-draw quad
+todo draw quad
 todo probe all rgba (0.4, 0.4, 0.4, 0.4) 1

uniform 0 float 0.7
-draw quad
+todo draw quad
 todo probe all rgba (0.8, 0.8, 0.8, 0.8) 1

uniform 0 float 0.9
-draw quad
+todo draw quad
 todo probe all rgba (0.9, 0.9, 0.9, 0.9) 1

[pixel shader todo]