[PATCH 0/2] MR480: vkd3d-shader/ir: Fix a couple of D3DBC details in the validator.

[PATCH 1/2] vkd3d-shader/ir: Expect two sources for LOOP in SM1-3.

[Giovanni Mascellani]

From: Giovanni Mascellani

---
 libs/vkd3d-shader/ir.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c
index 2a3343994..b8cb6a410 100644
--- a/libs/vkd3d-shader/ir.c
+++ b/libs/vkd3d-shader/ir.c
@@ -1716,7 +1716,7 @@ static void vsir_validate_instruction(struct validation_context *ctx)

case VKD3DSIH_LOOP:
             vsir_validate_dst_count(ctx, instruction, 0);
-            vsir_validate_src_count(ctx, instruction, 0);
+            vsir_validate_src_count(ctx, instruction, ctx->parser->shader_version.major <= 3 ? 2 : 0);
             if (!vkd3d_array_reserve((void **)&ctx->blocks, &ctx->blocks_capacity, ctx->depth + 1, sizeof(*ctx->blocks)))
                 return;
             ctx->blocks[ctx->depth++] = instruction->handler_idx;

[PATCH 2/2] vkd3d-shader/ir: Validate IFC instructions.

[Giovanni Mascellani]

From: Giovanni Mascellani

---
 libs/vkd3d-shader/ir.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c
index b8cb6a410..5c88946bb 100644
--- a/libs/vkd3d-shader/ir.c
+++ b/libs/vkd3d-shader/ir.c
@@ -1696,6 +1696,14 @@ static void vsir_validate_instruction(struct validation_context *ctx)
             ctx->blocks[ctx->depth++] = instruction->handler_idx;
             break;

+        case VKD3DSIH_IFC:
+            vsir_validate_dst_count(ctx, instruction, 0);
+            vsir_validate_src_count(ctx, instruction, 2);
+            if (!vkd3d_array_reserve((void **)&ctx->blocks, &ctx->blocks_capacity, ctx->depth + 1, sizeof(*ctx->blocks)))
+                return;
+            ctx->blocks[ctx->depth++] = VKD3DSIH_IF;
+            break;
+
         case VKD3DSIH_ELSE:
             vsir_validate_dst_count(ctx, instruction, 0);
             vsir_validate_src_count(ctx, instruction, 0);

[PATCH 0/2] MR480: vkd3d-shader/ir: Fix a couple of D3DBC details in the validator. - approved

[Giovanni Mascellani (＠giomasce)]

This merge request was approved by Giovanni Mascellani.

[PATCH 0/2] MR480: vkd3d-shader/ir: Fix a couple of D3DBC details in the validator. - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.