[PATCH 0/16] MR647: vkd3d-shader/dxil: Check for src param allocation failure.

[PATCH 01/16] vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_binop().

[Conor McCarthy]

From: Conor McCarthy

---
 libs/vkd3d-shader/dxil.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index a001f6f06..05f42739a 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -3500,7 +3500,8 @@ static void sm6_parser_emit_binop(struct sm6_parser *sm6, const struct dxil_reco
                 "Ignoring flags %#"PRIx64" for a binary operation.", flags);
     }

-    src_params = instruction_src_params_alloc(ins, 2, sm6);
+    if (!(src_params = instruction_src_params_alloc(ins, 2, sm6)))
+        return;
     src_param_init_from_value(&src_params[0], a);
     src_param_init_from_value(&src_params[1], b);
     if (code == BINOP_SUB)

[PATCH 02/16] vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_unary().

[Conor McCarthy]

From: Conor McCarthy

---
 libs/vkd3d-shader/dxil.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index 05f42739a..3598ca26e 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -3752,7 +3752,8 @@ static void sm6_parser_emit_dx_unary(struct sm6_parser *sm6, enum dx_intrinsic_o
     struct vkd3d_shader_src_param *src_param;

vsir_instruction_init(ins, &sm6->p.location, map_dx_unary_op(op));
-    src_param = instruction_src_params_alloc(ins, 1, sm6);
+    if (!(src_param = instruction_src_params_alloc(ins, 1, sm6)))
+        return;
     src_param_init_from_value(src_param, operands[0]);

instruction_dst_param_init_ssa_scalar(ins, sm6);

[PATCH 03/16] vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_binary().

[Conor McCarthy]

From: Conor McCarthy

---
 libs/vkd3d-shader/dxil.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index 3598ca26e..853c74693 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -3787,7 +3787,8 @@ static void sm6_parser_emit_dx_binary(struct sm6_parser *sm6, enum dx_intrinsic_
     struct vkd3d_shader_src_param *src_params;

vsir_instruction_init(ins, &sm6->p.location, map_dx_binary_op(op, operands[0]->type));
-    src_params = instruction_src_params_alloc(ins, 2, sm6);
+    if (!(src_params = instruction_src_params_alloc(ins, 2, sm6)))
+        return;
     src_param_init_from_value(&src_params[0], operands[0]);
     src_param_init_from_value(&src_params[1], operands[1]);

[PATCH 04/16] vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_cbuffer_load().

[Conor McCarthy]

From: Conor McCarthy

---
 libs/vkd3d-shader/dxil.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index 853c74693..cd95720fc 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -3810,7 +3810,8 @@ static void sm6_parser_emit_dx_cbuffer_load(struct sm6_parser *sm6, enum dx_intr

vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV);

-    src_param = instruction_src_params_alloc(ins, 1, sm6);
+    if (!(src_param = instruction_src_params_alloc(ins, 1, sm6)))
+        return;
     src_param_init_vector_from_reg(src_param, &buffer->u.handle.reg);
     register_index_address_init(&src_param->reg.idx[2], operands[1], sm6);
     assert(src_param->reg.idx_count == 3);

[PATCH 05/16] vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_tertiary().

[Conor McCarthy]

From: Conor McCarthy

---
 libs/vkd3d-shader/dxil.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index cd95720fc..678cfc8ab 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -3907,7 +3907,8 @@ static void sm6_parser_emit_dx_tertiary(struct sm6_parser *sm6, enum dx_intrinsi
     unsigned int i;

vsir_instruction_init(ins, &sm6->p.location, sm6_dx_map_tertiary_op(op));
-    src_params = instruction_src_params_alloc(ins, 3, sm6);
+    if (!(src_params = instruction_src_params_alloc(ins, 3, sm6)))
+        return;
     for (i = 0; i < 3; ++i)
         src_param_init_from_value(&src_params[i], operands[i]);

[PATCH 06/16] vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_load_input().

[Conor McCarthy]

From: Conor McCarthy

---
 libs/vkd3d-shader/dxil.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index 678cfc8ab..bcc3c4cd6 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -3939,7 +3939,8 @@ static void sm6_parser_emit_dx_load_input(struct sm6_parser *sm6, enum dx_intrin
     }
     e = &signature->elements[row_index];

-    src_param = instruction_src_params_alloc(ins, 1, sm6);
+    if (!(src_param = instruction_src_params_alloc(ins, 1, sm6)))
+        return;
     src_param->reg = sm6->input_params[row_index].reg;
     src_param_init_scalar(src_param, column_index);
     if (e->register_count > 1)

[PATCH 07/16] vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_buffer_load().

[Conor McCarthy]

From: Conor McCarthy

---
 libs/vkd3d-shader/dxil.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index bcc3c4cd6..3544b9288 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -4019,7 +4019,8 @@ static void sm6_parser_emit_dx_buffer_load(struct sm6_parser *sm6, enum dx_intri
     instruction_init_with_resource(ins, (resource->u.handle.d->type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV)
             ? VKD3DSIH_LD_UAV_TYPED : VKD3DSIH_LD, resource, sm6);

-    src_params = instruction_src_params_alloc(ins, 2, sm6);
+    if (!(src_params = instruction_src_params_alloc(ins, 2, sm6)))
+        return;
     src_param_init_from_value(&src_params[0], operands[1]);
     if (!sm6_value_is_undef(operands[2]))
     {

[PATCH 08/16] vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_sincos().

[Conor McCarthy]

From: Conor McCarthy

---
 libs/vkd3d-shader/dxil.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index 3544b9288..45857a397 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -4057,7 +4057,8 @@ static void sm6_parser_emit_dx_sincos(struct sm6_parser *sm6, enum dx_intrinsic_
     unsigned int index;

vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_SINCOS);
-    src_param = instruction_src_params_alloc(ins, 1, sm6);
+    if (!(src_param = instruction_src_params_alloc(ins, 1, sm6)))
+        return;
     src_param_init_from_value(src_param, operands[0]);

index = op == DX_COS;

[PATCH 09/16] vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_split_double().

[Conor McCarthy]

From: Conor McCarthy

---
 libs/vkd3d-shader/dxil.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index 45857a397..5c48ad950 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -4077,7 +4077,8 @@ static void sm6_parser_emit_dx_split_double(struct sm6_parser *sm6, enum dx_intr
     struct vkd3d_shader_src_param *src_param;

vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV);
-    src_param = instruction_src_params_alloc(ins, 1, sm6);
+    if (!(src_param = instruction_src_params_alloc(ins, 1, sm6)))
+        return;
     src_param_init_from_value(src_param, operands[0]);

instruction_dst_param_init_ssa_vector(ins, 2, sm6);

[PATCH 10/16] vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_dx_texture_load().

[Conor McCarthy]

From: Conor McCarthy

---
 libs/vkd3d-shader/dxil.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index 5c48ad950..cc8291272 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -4173,7 +4173,8 @@ static void sm6_parser_emit_dx_texture_load(struct sm6_parser *sm6, enum dx_intr
     for (i = 0; i < VKD3D_VEC4_SIZE; ++i)
         ins->resource_data_type[i] = resource->u.handle.d->resource_data_type;

-    src_params = instruction_src_params_alloc(ins, 2 + is_multisample, sm6);
+    if (!(src_params = instruction_src_params_alloc(ins, 2 + is_multisample, sm6)))
+        return;
     src_param_init_vector_from_reg(&src_params[0], &coord);
     src_param_init_vector_from_reg(&src_params[1], &resource->u.handle.reg);
     if (is_multisample)

[PATCH 11/16] vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_cast().

[Conor McCarthy]

From: Conor McCarthy

---
 libs/vkd3d-shader/dxil.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index cc8291272..95c46c3f6 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -4671,7 +4671,8 @@ static void sm6_parser_emit_cast(struct sm6_parser *sm6, const struct dxil_recor
         return;
     }

-    src_param = instruction_src_params_alloc(ins, 1, sm6);
+    if (!(src_param = instruction_src_params_alloc(ins, 1, sm6)))
+        return;
     src_param_init_from_value(src_param, value);

instruction_dst_param_init_ssa_scalar(ins, sm6);

[PATCH 12/16] vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_cmp2().

[Conor McCarthy]

From: Conor McCarthy

---
 libs/vkd3d-shader/dxil.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index 95c46c3f6..75a967375 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -4808,7 +4808,8 @@ static void sm6_parser_emit_cmp2(struct sm6_parser *sm6, const struct dxil_recor
                 "Ignoring flags %#"PRIx64" for a comparison operation.", flags);
     }

-    src_params = instruction_src_params_alloc(ins, 2, sm6);
+    if (!(src_params = instruction_src_params_alloc(ins, 2, sm6)))
+        return;
     src_param_init_from_value(&src_params[0 ^ cmp->src_swap], a);
     src_param_init_from_value(&src_params[1 ^ cmp->src_swap], b);

[PATCH 13/16] vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_extractval().

[Conor McCarthy]

From: Conor McCarthy

---
 libs/vkd3d-shader/dxil.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index 75a967375..26c8e5a6e 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -4867,7 +4867,8 @@ static void sm6_parser_emit_extractval(struct sm6_parser *sm6, const struct dxil

vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV);

-    src_param = instruction_src_params_alloc(ins, 1, sm6);
+    if (!(src_param = instruction_src_params_alloc(ins, 1, sm6)))
+        return;
     src_param->reg = src->u.reg;
     src_param_init_scalar(src_param, elem_idx);

[PATCH 14/16] vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_load().

[Conor McCarthy]

From: Conor McCarthy

---
 libs/vkd3d-shader/dxil.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index 26c8e5a6e..1a532f761 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -5019,7 +5019,8 @@ static void sm6_parser_emit_load(struct sm6_parser *sm6, const struct dxil_recor

vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV);

-    src_param = instruction_src_params_alloc(ins, 1, sm6);
+    if (!(src_param = instruction_src_params_alloc(ins, 1, sm6)))
+        return;
     src_param_init_from_value(&src_param[0], ptr);
     src_param->reg.alignment = alignment;

[PATCH 15/16] vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_store().

[Conor McCarthy]

From: Conor McCarthy

---
 libs/vkd3d-shader/dxil.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index 1a532f761..d40f96047 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -5179,7 +5179,8 @@ static void sm6_parser_emit_store(struct sm6_parser *sm6, const struct dxil_reco

vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV);

-    src_param = instruction_src_params_alloc(ins, 1, sm6);
+    if (!(src_param = instruction_src_params_alloc(ins, 1, sm6)))
+        return;
     src_param_init_from_value(&src_param[0], src);

dst_param = instruction_dst_params_alloc(ins, 1, sm6);

[PATCH 16/16] vkd3d-shader/dxil: Check for src param allocation failure in sm6_parser_emit_vselect().

[Conor McCarthy]

From: Conor McCarthy

---
 libs/vkd3d-shader/dxil.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index d40f96047..e7b7f3c80 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -5300,7 +5300,8 @@ static void sm6_parser_emit_vselect(struct sm6_parser *sm6, const struct dxil_re

vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOVC);

-    src_params = instruction_src_params_alloc(ins, 3, sm6);
+    if (!(src_params = instruction_src_params_alloc(ins, 3, sm6)))
+        return;
     for (i = 0; i < 3; ++i)
         src_param_init_from_value(&src_params[i], src[i]);

[PATCH 0/16] MR647: vkd3d-shader/dxil: Check for src param allocation failure. - approved

[Giovanni Mascellani (＠giomasce)]

This merge request was approved by Giovanni Mascellani.

[PATCH 0/16] MR647: vkd3d-shader/dxil: Check for src param allocation failure. - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.