wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Return void from hlsl_block_add_store_component().

Browse Source
This commit is contained in:
Elizabeth Figura
2024-12-09 13:48:57 -06:00
committed by Henri Verbeet
parent 9e3ac35669
commit 009f5765df
Notes: Henri Verbeet 2025-03-05 14:16:50 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Francisco Casas (@fcasas)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1401
4 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libs/vkd3d-shader/hlsl.y
View File

@@ -1611,8 +1611,7 @@ static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct hlsl_block *bl
if (!(value = add_expr(ctx, block, op, cell_operands, scalar_type, loc)))
return NULL;
if (!hlsl_block_add_store_component(ctx, block, &var_deref, i, value))
return NULL;
hlsl_block_add_store_component(ctx, block, &var_deref, i, value);
}
if (!(var_load = hlsl_new_var_load(ctx, var, loc)))
@@ -2216,11 +2215,7 @@ static bool add_assignment(struct hlsl_ctx *ctx, struct hlsl_block *block, struc
return false;
}
if (!hlsl_block_add_store_component(ctx, block, &deref, component, load))
{
hlsl_cleanup_deref(&deref);
return false;
}
hlsl_block_add_store_component(ctx, block, &deref, component, load);
}
}
@@ -2393,8 +2388,7 @@ static void initialize_var_components(struct hlsl_ctx *ctx, struct hlsl_block *i
if (!(conv = add_implicit_conversion(ctx, instrs, load, dst_comp_type, &src->loc)))
return;
if (!hlsl_block_add_store_component(ctx, instrs, &dst_deref, *store_index, conv))
return;
hlsl_block_add_store_component(ctx, instrs, &dst_deref, *store_index, conv);
}
}
@@ -3138,8 +3132,7 @@ static struct hlsl_ir_node *add_user_call(struct hlsl_ctx *ctx,
return NULL;
hlsl_block_add_instr(args->instrs, comp);
if (!hlsl_block_add_store_component(ctx, args->instrs, &param_deref, j, comp))
return NULL;
hlsl_block_add_store_component(ctx, args->instrs, &param_deref, j, comp);
}
}
}
@@ -4454,9 +4447,8 @@ static bool intrinsic_mul(struct hlsl_ctx *ctx,
}
}
if (!hlsl_block_add_store_component(ctx, params->instrs, &var_deref,
j * matrix_type->e.numeric.dimx + i, instr))
return false;
hlsl_block_add_store_component(ctx, params->instrs, &var_deref,
j * matrix_type->e.numeric.dimx + i, instr);
}
}
@@ -5112,9 +5104,8 @@ static bool intrinsic_transpose(struct hlsl_ctx *ctx,
j * arg->data_type->e.numeric.dimx + i, loc)))
return false;
if (!hlsl_block_add_store_component(ctx, params->instrs, &var_deref,
i * var->data_type->e.numeric.dimx + j, load))
return false;
hlsl_block_add_store_component(ctx, params->instrs, &var_deref,
i * var->data_type->e.numeric.dimx + j, load);
}
}