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: Split matrix copies from resource loads.

Browse Source
This commit is contained in:
Victor Chiletto
2025-02-27 16:23:23 -03:00
committed by Henri Verbeet
parent e718546ee5
commit e615e435d9
Notes: Henri Verbeet 2025-08-05 16:40:11 +02:00 
Approved-by: Francisco Casas (@fcasas)
Approved-by: Elizabeth Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1457
1 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
libs/vkd3d-shader/hlsl_codegen.c
View File

@@ -3677,7 +3677,30 @@ static bool lower_stream_appends(struct hlsl_ctx *ctx, struct hlsl_ir_node *inst
hlsl_src_remove(&store->value); hlsl_src_remove(&store->value);
return true; return true;
}
static void split_resource_load(struct hlsl_ctx *ctx, struct hlsl_ir_store *store,
struct hlsl_ir_resource_load *load, const unsigned int idx, struct hlsl_type *type)
{
struct hlsl_ir_resource_load *vector_load;
struct hlsl_ir_node *c, *idx_offset;
struct hlsl_block block;
hlsl_block_init(&block);
c = hlsl_block_add_uint_constant(ctx, &block, idx, &store->node.loc);
idx_offset = hlsl_block_add_packed_index_offset_append(ctx, &block,
load->byte_offset.node, c, load->node.data_type, &store->node.loc);
vector_load = hlsl_ir_resource_load(hlsl_clone_instr(ctx, &load->node));
hlsl_src_remove(&vector_load->byte_offset);
hlsl_src_from_node(&vector_load->byte_offset, idx_offset);
vector_load->node.data_type = type;
hlsl_block_add_instr(&block, &vector_load->node);
hlsl_block_add_store_index(ctx, &block, &store->lhs, c, &vector_load->node, 0, &store->node.loc);
list_move_before(&store->node.entry, &block.instrs);
} }
static bool split_matrix_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) static bool split_matrix_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context)
@@ -3698,17 +3721,33 @@ static bool split_matrix_copies(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr
return false; return false;
element_type = hlsl_get_vector_type(ctx, type->e.numeric.type, hlsl_type_minor_size(type)); element_type = hlsl_get_vector_type(ctx, type->e.numeric.type, hlsl_type_minor_size(type));
if (rhs->type != HLSL_IR_LOAD) if (rhs->type != HLSL_IR_LOAD && rhs->type != HLSL_IR_RESOURCE_LOAD)
{ {
hlsl_fixme(ctx, &instr->loc, "Copying from unsupported node type."); hlsl_fixme(ctx, &instr->loc, "Copying from unsupported node type.");
return false; return false;
} }
if (rhs->type == HLSL_IR_RESOURCE_LOAD)
{
/* As we forbid non-scalar or vector types in non-structured resource
* loads, this is specific to structured buffer loads. */
struct hlsl_ir_resource_load *load = hlsl_ir_resource_load(rhs);
VKD3D_ASSERT(hlsl_deref_get_type(ctx, &load->resource)->sampler_dim == HLSL_SAMPLER_DIM_STRUCTURED_BUFFER);
for (i = 0; i < hlsl_type_major_size(type); ++i)
{
split_resource_load(ctx, store, load, i, element_type);
}
}
else
{
for (i = 0; i < hlsl_type_major_size(type); ++i) for (i = 0; i < hlsl_type_major_size(type); ++i)
{ {
if (!split_copy(ctx, store, hlsl_ir_load(rhs), i, element_type)) if (!split_copy(ctx, store, hlsl_ir_load(rhs), i, element_type))
return false; return false;
} }
}
list_remove(&store->node.entry); list_remove(&store->node.entry);
hlsl_free_instr(&store->node); hlsl_free_instr(&store->node);