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: Express deref->offset in whole registers.

Browse Source 
This is required to use SM4 relative addressing, because it is limited
to whole-register granularity.
This commit is contained in:
Francisco Casas
2023-10-03 19:14:54 -03:00
committed by Alexandre Julliard
parent 61a17643a2
commit 1520f327e5
Notes: Alexandre Julliard 2023-10-31 22:38:12 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Zebediah Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/396
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,14 +37,7 @@ static struct hlsl_ir_node *new_offset_from_path_index(struct hlsl_ctx *ctx, str
case HLSL_CLASS_MATRIX:
{
if (!(c = hlsl_new_uint_constant(ctx, 4, loc)))
return NULL;
hlsl_block_add_instr(block, c);
if (!(idx_offset = hlsl_new_binary_expr(ctx, HLSL_OP2_MUL, c, idx)))
return NULL;
hlsl_block_add_instr(block, idx_offset);
idx_offset = idx;
break;
}
@@ -52,6 +45,12 @@ static struct hlsl_ir_node *new_offset_from_path_index(struct hlsl_ctx *ctx, str
{
unsigned int size = hlsl_type_get_array_element_reg_size(type->e.array.type, regset);
if (regset == HLSL_REGSET_NUMERIC)
{
assert(size % 4 == 0);
size /= 4;
}
if (!(c = hlsl_new_uint_constant(ctx, size, loc)))
return NULL;
hlsl_block_add_instr(block, c);
@@ -73,7 +72,7 @@ static struct hlsl_ir_node *new_offset_from_path_index(struct hlsl_ctx *ctx, str
{
assert(*offset_component == 0);
*offset_component = field_offset % 4;
field_offset -= *offset_component;
field_offset /= 4;
}
if (!(c = hlsl_new_uint_constant(ctx, field_offset, loc)))
@@ -4470,7 +4469,10 @@ bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref
if (offset_node->type != HLSL_IR_CONSTANT)
return false;
*offset += hlsl_ir_constant(offset_node)->value.u[0].u;
if (regset == HLSL_REGSET_NUMERIC)
*offset += 4 * hlsl_ir_constant(offset_node)->value.u[0].u;
else
*offset += hlsl_ir_constant(offset_node)->value.u[0].u;
}
size = deref->var->data_type->reg_size[regset];