wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Synthesize the swizzle and replace the instruction inside of copy_propagation_compute_replacement().

Browse Source 
Rename it to copy_propagation_replace_with_single_instr() accordingly.

The idea is to introduce a constant vector replacement pass which will do the
same thing.
This commit is contained in:
Zebediah Figura 2023-01-12 16:28:44 -06:00 committed by Alexandre Julliard
parent 5d34790402
commit 8c2b8ff245
Notes: Alexandre Julliard 2023-01-24 22:27:58 +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/51
1 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -723,61 +723,65 @@ static void copy_propagation_set_value(struct copy_propagation_var_def *var_def,
} }
} }
static struct hlsl_ir_node *copy_propagation_compute_replacement(struct hlsl_ctx *ctx, static bool copy_propagation_replace_with_single_instr(struct hlsl_ctx *ctx,
const struct copy_propagation_state *state, const struct hlsl_deref *deref, const struct copy_propagation_state *state, struct hlsl_ir_load *load)
unsigned int *swizzle)
{ {
const struct hlsl_deref *deref = &load->src;
const struct hlsl_ir_var *var = deref->var; const struct hlsl_ir_var *var = deref->var;
struct hlsl_ir_node *instr = NULL; struct hlsl_ir_node *instr = &load->node;
struct hlsl_ir_node *new_instr = NULL;
unsigned int start, count, i; unsigned int start, count, i;
unsigned int ret_swizzle = 0;
if (!hlsl_component_index_range_from_deref(ctx, deref, &start, &count)) if (!hlsl_component_index_range_from_deref(ctx, deref, &start, &count))
return NULL; return false;
*swizzle = 0;
for (i = 0; i < count; ++i) for (i = 0; i < count; ++i)
{ {
struct copy_propagation_value *value = copy_propagation_get_value(state, var, start + i); struct copy_propagation_value *value = copy_propagation_get_value(state, var, start + i);
if (!value) if (!value)
return NULL; return false;
if (!instr) if (!new_instr)
{ {
instr = value->node; new_instr = value->node;
} }
else if (instr != value->node) else if (new_instr != value->node)
{ {
TRACE("No single source for propagating load from %s[%u-%u].\n", var->name, start, start + count); TRACE("No single source for propagating load from %s[%u-%u].\n", var->name, start, start + count);
return NULL; return false;
} }
*swizzle |= value->component << HLSL_SWIZZLE_SHIFT(i); ret_swizzle |= value->component << HLSL_SWIZZLE_SHIFT(i);
} }
TRACE("Load from %s[%u-%u] propagated as instruction %p%s.\n", TRACE("Load from %s[%u-%u] propagated as instruction %p%s.\n",
var->name, start, start + count, instr, debug_hlsl_swizzle(*swizzle, count)); var->name, start, start + count, new_instr, debug_hlsl_swizzle(ret_swizzle, count));
return instr;
if (instr->data_type->type != HLSL_CLASS_OBJECT)
{
struct hlsl_ir_swizzle *swizzle_node;
if (!(swizzle_node = hlsl_new_swizzle(ctx, ret_swizzle, count, new_instr, &instr->loc)))
return false;
list_add_before(&instr->entry, &swizzle_node->node.entry);
new_instr = &swizzle_node->node;
}
hlsl_replace_node(instr, new_instr);
return true;
} }
static bool copy_propagation_transform_load(struct hlsl_ctx *ctx, static bool copy_propagation_transform_load(struct hlsl_ctx *ctx,
struct hlsl_ir_load *load, struct copy_propagation_state *state) struct hlsl_ir_load *load, struct copy_propagation_state *state)
{ {
struct hlsl_ir_node *instr = &load->node, *new_instr; struct hlsl_type *type = load->node.data_type;
struct hlsl_type *type = instr->data_type;
struct hlsl_ir_swizzle *swizzle_node;
unsigned int dimx = 0;
unsigned int swizzle;
switch (type->type) switch (type->type)
{ {
case HLSL_CLASS_SCALAR: case HLSL_CLASS_SCALAR:
case HLSL_CLASS_VECTOR: case HLSL_CLASS_VECTOR:
dimx = type->dimx;
break;
case HLSL_CLASS_OBJECT: case HLSL_CLASS_OBJECT:
dimx = 1;
break; break;
case HLSL_CLASS_MATRIX: case HLSL_CLASS_MATRIX:
@ -788,18 +792,10 @@ static bool copy_propagation_transform_load(struct hlsl_ctx *ctx,
return false; return false;
} }
if (!(new_instr = copy_propagation_compute_replacement(ctx, state, &load->src, &swizzle))) if (copy_propagation_replace_with_single_instr(ctx, state, load))
return false;
if (type->type != HLSL_CLASS_OBJECT)
{
if (!(swizzle_node = hlsl_new_swizzle(ctx, swizzle, dimx, new_instr, &instr->loc)))
return false;
list_add_before(&instr->entry, &swizzle_node->node.entry);
new_instr = &swizzle_node->node;
}
hlsl_replace_node(instr, new_instr);
return true; return true;
return false;
} }
static bool copy_propagation_transform_object_load(struct hlsl_ctx *ctx, static bool copy_propagation_transform_object_load(struct hlsl_ctx *ctx,