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: Propagate copies for resource load instructions.

Browse Source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2022-01-21 22:22:29 +01:00 committed by Alexandre Julliard
parent 4529fbe57f
commit 8cb3ec4640
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -306,9 +306,6 @@ XFAIL_TESTS = \
tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing.shader_test \
tests/hlsl-vector-indexing-uniform.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \
tests/max.shader_test \ tests/max.shader_test \
tests/sampler.shader_test \
tests/texture-load.shader_test \
tests/texture-load-typed.shader_test \
tests/trigonometry.shader_test tests/trigonometry.shader_test
endif endif

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

@ -399,8 +399,8 @@ static struct hlsl_ir_node *copy_propagation_compute_replacement(const struct co
return node; return node;
} }
static bool copy_propagation_analyze_load(struct hlsl_ctx *ctx, struct hlsl_ir_load *load, static bool copy_propagation_transform_load(struct hlsl_ctx *ctx,
struct copy_propagation_state *state) struct hlsl_ir_load *load, struct copy_propagation_state *state)
{ {
struct hlsl_ir_node *node = &load->node, *new_node; struct hlsl_ir_node *node = &load->node, *new_node;
struct hlsl_type *type = node->data_type; struct hlsl_type *type = node->data_type;
@ -441,6 +441,35 @@ static bool copy_propagation_analyze_load(struct hlsl_ctx *ctx, struct hlsl_ir_l
return true; return true;
} }
static bool copy_propagation_transform_object_load(struct hlsl_ctx *ctx,
struct hlsl_deref *deref, struct copy_propagation_state *state)
{
struct hlsl_ir_load *load;
struct hlsl_ir_node *node;
unsigned int swizzle;
if (!(node = copy_propagation_compute_replacement(state, deref, 1, &swizzle)))
return false;
/* Only HLSL_IR_LOAD can produce an object. */
load = hlsl_ir_load(node);
deref->var = load->src.var;
hlsl_src_remove(&deref->offset);
hlsl_src_from_node(&deref->offset, load->src.offset.node);
return true;
}
static bool copy_propagation_transform_resource_load(struct hlsl_ctx *ctx,
struct hlsl_ir_resource_load *load, struct copy_propagation_state *state)
{
bool progress = false;
progress |= copy_propagation_transform_object_load(ctx, &load->resource, state);
if (load->sampler.var)
progress |= copy_propagation_transform_object_load(ctx, &load->sampler, state);
return progress;
}
static void copy_propagation_record_store(struct hlsl_ctx *ctx, struct hlsl_ir_store *store, static void copy_propagation_record_store(struct hlsl_ctx *ctx, struct hlsl_ir_store *store,
struct copy_propagation_state *state) struct copy_propagation_state *state)
{ {
@ -477,7 +506,11 @@ static bool copy_propagation_transform_block(struct hlsl_ctx *ctx, struct hlsl_b
switch (instr->type) switch (instr->type)
{ {
case HLSL_IR_LOAD: case HLSL_IR_LOAD:
progress |= copy_propagation_analyze_load(ctx, hlsl_ir_load(instr), state); progress |= copy_propagation_transform_load(ctx, hlsl_ir_load(instr), state);
break;
case HLSL_IR_RESOURCE_LOAD:
progress |= copy_propagation_transform_resource_load(ctx, hlsl_ir_resource_load(instr), state);
break; break;
case HLSL_IR_STORE: case HLSL_IR_STORE: