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: Allocate instructions directly in sm6_parser_emit_dx_buffer_load().

Browse Source
This commit is contained in:
Giovanni Mascellani
2025-12-02 22:39:05 +01:00
committed by Henri Verbeet
parent e0ef0c4a67
commit 203fc6d773
Notes: Henri Verbeet 2025-12-04 20:17:40 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1857
1 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2962,15 +2962,20 @@ static bool instruction_dst_param_init_ssa_scalar(struct vkd3d_shader_instructio
return true; return true;
} }
static void instruction_dst_param_init_ssa_vector(struct vkd3d_shader_instruction *ins, static bool instruction_dst_param_init_ssa_vector(struct vkd3d_shader_instruction *ins,
unsigned int component_count, struct sm6_parser *sm6) unsigned int component_count, struct sm6_parser *dxil)
{ {
struct vsir_dst_operand *param = instruction_dst_params_alloc(ins, 1, sm6); struct sm6_value *dxil_dst = sm6_parser_get_current_value(dxil);
struct sm6_value *dst = sm6_parser_get_current_value(sm6); struct vsir_dst_operand *vsir_dst;
dst_param_init_vector(param, component_count); if (!(vsir_dst = instruction_dst_params_alloc(ins, 1, dxil)))
sm6_parser_init_ssa_value(sm6, dst); return false;
vsir_register_from_dxil_value(&param->reg, dst, 0, sm6);
dst_param_init_vector(vsir_dst, component_count);
sm6_parser_init_ssa_value(dxil, dxil_dst);
vsir_register_from_dxil_value(&vsir_dst->reg, dxil_dst, 0, dxil);
return true;
} }
static bool instruction_dst_param_init_uint_temp_vector(struct vkd3d_shader_instruction *ins, struct sm6_parser *sm6) static bool instruction_dst_param_init_uint_temp_vector(struct vkd3d_shader_instruction *ins, struct sm6_parser *sm6)
@@ -6217,7 +6222,7 @@ static void sm6_parser_emit_dx_raw_buffer_store(struct sm6_parser *sm6, enum dx_
static void sm6_parser_emit_dx_buffer_load(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, static void sm6_parser_emit_dx_buffer_load(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; struct vkd3d_shader_instruction *ins;
struct vsir_src_operand *src_params; struct vsir_src_operand *src_params;
const struct sm6_value *resource; const struct sm6_value *resource;
@@ -6227,33 +6232,36 @@ static void sm6_parser_emit_dx_buffer_load(struct sm6_parser *sm6, enum dx_intri
if (resource->u.handle.d->kind == RESOURCE_KIND_RAWBUFFER if (resource->u.handle.d->kind == RESOURCE_KIND_RAWBUFFER
|| resource->u.handle.d->kind == RESOURCE_KIND_STRUCTUREDBUFFER) || resource->u.handle.d->kind == RESOURCE_KIND_STRUCTUREDBUFFER)
{
return sm6_parser_emit_dx_raw_buffer_load(sm6, op, operands, state); return sm6_parser_emit_dx_raw_buffer_load(sm6, op, operands, state);
}
if (resource->u.handle.d->kind != RESOURCE_KIND_TYPEDBUFFER) if (resource->u.handle.d->kind != RESOURCE_KIND_TYPEDBUFFER)
{
WARN("Resource is not a typed buffer.\n");
vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_INVALID_OPERATION, vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_INVALID_OPERATION,
"Resource for a typed buffer load is not a typed buffer."); "Resource for a typed buffer load is not a typed buffer.");
}
if (!(ins = sm6_parser_add_function_instruction(sm6, state)))
return;
state->pushed_instruction = true;
instruction_init_with_resource(ins, (resource->u.handle.d->type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) instruction_init_with_resource(ins, (resource->u.handle.d->type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV)
? VSIR_OP_LD_UAV_TYPED : VSIR_OP_LD, resource, sm6); ? VSIR_OP_LD_UAV_TYPED : VSIR_OP_LD, resource, sm6);
if (!(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], 0, sm6);
if (!sm6_value_is_undef(operands[2]))
{ {
/* Constant zero would be ok, but is not worth checking for unless it shows up. */ vkd3d_shader_instruction_make_nop(ins);
WARN("Ignoring structure offset.\n"); return;
}
src_param_init_from_value(&src_params[0], operands[1], 0, sm6);
/* Constant zero would be ok, but is not worth checking for unless it
* shows up. */
if (!sm6_value_is_undef(operands[2]))
vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS,
"Ignoring structure offset for a typed buffer load."); "Ignoring structure offset for a typed buffer load.");
}
src_param_init_vector_from_handle(sm6, &src_params[1], &resource->u.handle); src_param_init_vector_from_handle(sm6, &src_params[1], &resource->u.handle);
instruction_dst_param_init_ssa_vector(ins, VKD3D_VEC4_SIZE, sm6); if (!instruction_dst_param_init_ssa_vector(ins, VKD3D_VEC4_SIZE, sm6))
vkd3d_shader_instruction_make_nop(ins);
} }
static void sm6_parser_emit_dx_buffer_store(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, static void sm6_parser_emit_dx_buffer_store(struct sm6_parser *sm6, enum dx_intrinsic_opcode op,