wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/fx: Handle assignments with array RHS indexed with a constant or a single variable.

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov 2024-09-22 11:09:22 +02:00 committed by Henri Verbeet
parent 2722346ffb
commit 994e994231
Notes: Henri Verbeet 2024-10-02 22:37:09 +02:00 
Approved-by: Elizabeth Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1101
2 changed files with 68 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
libs/vkd3d-shader/fx.c
View File

@ -1516,11 +1516,14 @@ static uint32_t write_fx_4_state_numeric_value(struct hlsl_ir_constant *value, s
static void write_fx_4_state_assignment(const struct hlsl_ir_var *var, struct hlsl_state_block_entry *entry, static void write_fx_4_state_assignment(const struct hlsl_ir_var *var, struct hlsl_state_block_entry *entry,
struct fx_write_context *fx) struct fx_write_context *fx)
{ {
uint32_t value_offset = 0, assignment_type = 0, rhs_offset; uint32_t value_offset = 0, assignment_type = 0, rhs_offset, type_offset, offset;
uint32_t type_offset; struct vkd3d_bytecode_buffer *unstructured = &fx->unstructured;
struct vkd3d_bytecode_buffer *buffer = &fx->structured; struct vkd3d_bytecode_buffer *buffer = &fx->structured;
struct hlsl_ctx *ctx = fx->ctx;
struct hlsl_ir_node *value = entry->args->node; struct hlsl_ir_node *value = entry->args->node;
struct hlsl_ctx *ctx = fx->ctx;
struct hlsl_ir_var *index_var;
struct hlsl_ir_constant *c;
struct hlsl_ir_load *load;
put_u32(buffer, entry->name_id); put_u32(buffer, entry->name_id);
put_u32(buffer, entry->lhs_index); put_u32(buffer, entry->lhs_index);
@ -1531,7 +1534,7 @@ static void write_fx_4_state_assignment(const struct hlsl_ir_var *var, struct hl
{ {
case HLSL_IR_CONSTANT: case HLSL_IR_CONSTANT:
{ {
struct hlsl_ir_constant *c = hlsl_ir_constant(value); c = hlsl_ir_constant(value);
value_offset = write_fx_4_state_numeric_value(c, fx); value_offset = write_fx_4_state_numeric_value(c, fx);
assignment_type = 1; assignment_type = 1;
@ -1539,15 +1542,71 @@ static void write_fx_4_state_assignment(const struct hlsl_ir_var *var, struct hl
} }
case HLSL_IR_LOAD: case HLSL_IR_LOAD:
{ {
struct hlsl_ir_load *l = hlsl_ir_load(value); load = hlsl_ir_load(value);
if (l->src.path_len) if (load->src.path_len)
hlsl_fixme(ctx, &var->loc, "Indexed access in RHS values is not implemented."); hlsl_fixme(ctx, &var->loc, "Indexed access in RHS values is not implemented.");
value_offset = write_fx_4_string(l->src.var->name, fx); value_offset = write_fx_4_string(load->src.var->name, fx);
assignment_type = 2; assignment_type = 2;
break; break;
} }
case HLSL_IR_INDEX:
{
struct hlsl_ir_index *index = hlsl_ir_index(value);
struct hlsl_ir_node *val = index->val.node;
struct hlsl_ir_node *idx = index->idx.node;
struct hlsl_type *type;
if (val->type != HLSL_IR_LOAD)
{
hlsl_fixme(ctx, &var->loc, "Unexpected indexed RHS value type.");
break;
}
load = hlsl_ir_load(val);
value_offset = write_fx_4_string(load->src.var->name, fx);
type = load->src.var->data_type;
switch (idx->type)
{
case HLSL_IR_CONSTANT:
{
c = hlsl_ir_constant(idx);
value_offset = put_u32(unstructured, value_offset);
put_u32(unstructured, c->value.u[0].u);
assignment_type = 3;
if (c->value.u[0].u >= type->e.array.elements_count)
hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_OFFSET_OUT_OF_BOUNDS,
"Array index %u exceeds array size %u.", c->value.u[0].u, type->e.array.elements_count);
break;
}
case HLSL_IR_LOAD:
{
load = hlsl_ir_load(idx);
index_var = load->src.var;
/* Special case for uint index variables, for anything more complex use an expression. */
if (hlsl_types_are_equal(index_var->data_type, hlsl_get_scalar_type(ctx, HLSL_TYPE_UINT))
&& !load->src.path_len)
{
offset = write_fx_4_string(index_var->name, fx);
value_offset = put_u32(unstructured, value_offset);
put_u32(unstructured, offset);
assignment_type = 4;
break;
}
}
/* fall through */
default:
hlsl_fixme(ctx, &var->loc, "Complex array index expressions in RHS values are not implemented.");
}
break;
}
default: default:
hlsl_fixme(ctx, &var->loc, "Unsupported assignment type for state %s.", entry->name); hlsl_fixme(ctx, &var->loc, "Unsupported assignment type for state %s.", entry->name);
} }

4
tests/hlsl/effect-assignments-fx_5.shader_test
View File

@ -18,7 +18,7 @@ technique11
} }
} }
[effect todo] [effect]
uint stencil_ref; uint stencil_ref;
uint stencil_refs[2]; uint stencil_refs[2];
uint index; uint index;
@ -39,7 +39,7 @@ technique11
} }
} }
[effect fail todo] [effect fail]
uint stencil_refs[2]; uint stencil_refs[2];
technique11 technique11