wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-12-15 08:03:30 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/dxil: Do not access unallocated instructions in sm6_parser_emit_dx_create_handle().

Browse Source
This commit is contained in:
Giovanni Mascellani
2025-12-04 12:08:12 +01:00
committed by Henri Verbeet
parent 267cbbebdf
commit 900c8f10a2
Notes: Henri Verbeet 2025-12-09 17:22:15 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1862
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/vkd3d-shader/dxil.c
View File

@@ -5630,7 +5630,6 @@ static const struct sm6_descriptor_info *sm6_parser_get_descriptor(struct sm6_pa
static void sm6_parser_emit_dx_create_handle(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, static void sm6_parser_emit_dx_create_handle(struct sm6_parser *sm6, enum dx_intrinsic_opcode op,
const struct sm6_value **operands, struct function_emission_state *state) const struct sm6_value **operands, struct function_emission_state *state)
{ {
struct vkd3d_shader_instruction *ins = state->ins;
enum vkd3d_shader_descriptor_type type; enum vkd3d_shader_descriptor_type type;
const struct sm6_descriptor_info *d; const struct sm6_descriptor_info *d;
struct sm6_value *dst; struct sm6_value *dst;
@@ -5640,7 +5639,6 @@ static void sm6_parser_emit_dx_create_handle(struct sm6_parser *sm6, enum dx_int
id = sm6_value_get_constant_uint(operands[1], sm6); id = sm6_value_get_constant_uint(operands[1], sm6);
if (!(d = sm6_parser_get_descriptor(sm6, type, id, operands[2]))) if (!(d = sm6_parser_get_descriptor(sm6, type, id, operands[2])))
{ {
WARN("Failed to find resource type %#x, id %#x.\n", type, id);
vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND, vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND,
"Descriptor for resource type %#x, id %#x was not found.", type, id); "Descriptor for resource type %#x, id %#x was not found.", type, id);
return; return;
@@ -5652,8 +5650,10 @@ static void sm6_parser_emit_dx_create_handle(struct sm6_parser *sm6, enum dx_int
dst->u.handle.index = operands[2]; dst->u.handle.index = operands[2];
dst->u.handle.non_uniform = !!sm6_value_get_constant_uint(operands[3], sm6); dst->u.handle.non_uniform = !!sm6_value_get_constant_uint(operands[3], sm6);
/* NOP is used to flag no instruction emitted. */ /* Well, not really, but the point here is that we pushed all the
ins->opcode = VSIR_OP_NOP; * instructions we had to (i.e., none), and sm6_parser_function_init()
* doesn't have to do it for us. */
state->pushed_instruction = true;
} }
static void sm6_parser_emit_dx_stream(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, static void sm6_parser_emit_dx_stream(struct sm6_parser *sm6, enum dx_intrinsic_opcode op,