[PATCH vkd3d 13/17] vkd3d-shader/hlsl: Replace register offsets with index paths in resource loads initialization.
Francisco Casas
fcasas at codeweavers.com
Thu Jul 14 20:23:55 CDT 2022
At this point, the parse code is free of offsets; it only uses index
paths.
---
v2:
* Split from a previous patch.
Signed-off-by: Francisco Casas <fcasas at codeweavers.com>
---
libs/vkd3d-shader/hlsl.c | 33 +++++++++++++++++++++++++-------
libs/vkd3d-shader/hlsl.h | 5 ++---
libs/vkd3d-shader/hlsl.y | 31 ++++--------------------------
libs/vkd3d-shader/hlsl_codegen.c | 3 +++
4 files changed, 35 insertions(+), 37 deletions(-)
diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index 0cd88ba6..6f2c3198 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -831,6 +831,28 @@ static bool init_deref(struct hlsl_ctx *ctx, struct hlsl_deref *deref, struct hl
return true;
}
+static bool deref_copy(struct hlsl_ctx *ctx, struct hlsl_deref *deref, struct hlsl_deref *other)
+{
+ unsigned int i;
+
+ memset(deref, 0, sizeof(*deref));
+
+ if (!other)
+ return true;
+
+ assert(!other->offset.node);
+
+ if (!init_deref(ctx, deref, other->var, other->path_len))
+ return false;
+
+ for (i = 0; i < deref->path_len; ++i)
+ hlsl_src_from_node(&deref->path[i], other->path[i].node);
+
+ hlsl_src_from_node(&deref->offset, other->offset.node);
+
+ return true;
+}
+
static struct hlsl_type *get_type_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref)
{
struct hlsl_type *type = deref->var->data_type;
@@ -1165,9 +1187,8 @@ struct hlsl_ir_load *hlsl_new_load_component(struct hlsl_ctx *ctx, struct hlsl_b
}
struct hlsl_ir_resource_load *hlsl_new_resource_load(struct hlsl_ctx *ctx, struct hlsl_type *data_type,
- enum hlsl_resource_load_type type, struct hlsl_ir_var *resource, struct hlsl_ir_node *resource_offset,
- struct hlsl_ir_var *sampler, struct hlsl_ir_node *sampler_offset, struct hlsl_ir_node *coords,
- struct hlsl_ir_node *texel_offset, const struct vkd3d_shader_location *loc)
+ enum hlsl_resource_load_type type, struct hlsl_deref *resource, struct hlsl_deref *sampler,
+ struct hlsl_ir_node *coords, struct hlsl_ir_node *texel_offset, const struct vkd3d_shader_location *loc)
{
struct hlsl_ir_resource_load *load;
@@ -1175,10 +1196,8 @@ struct hlsl_ir_resource_load *hlsl_new_resource_load(struct hlsl_ctx *ctx, struc
return NULL;
init_node(&load->node, HLSL_IR_RESOURCE_LOAD, data_type, *loc);
load->load_type = type;
- load->resource.var = resource;
- hlsl_src_from_node(&load->resource.offset, resource_offset);
- load->sampler.var = sampler;
- hlsl_src_from_node(&load->sampler.offset, sampler_offset);
+ deref_copy(ctx, &load->resource, resource);
+ deref_copy(ctx, &load->sampler, sampler);
hlsl_src_from_node(&load->coords, coords);
hlsl_src_from_node(&load->texel_offset, texel_offset);
return load;
diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h
index 72e7fab2..f54b7cb7 100644
--- a/libs/vkd3d-shader/hlsl.h
+++ b/libs/vkd3d-shader/hlsl.h
@@ -777,9 +777,8 @@ struct hlsl_ir_node *hlsl_new_offset_node_from_deref(struct hlsl_ctx *ctx, struc
const struct hlsl_deref *deref, const struct vkd3d_shader_location *loc);
struct hlsl_ir_resource_load *hlsl_new_resource_load(struct hlsl_ctx *ctx, struct hlsl_type *data_type,
- enum hlsl_resource_load_type type, struct hlsl_ir_var *resource, struct hlsl_ir_node *resource_offset,
- struct hlsl_ir_var *sampler, struct hlsl_ir_node *sampler_offset, struct hlsl_ir_node *coords,
- struct hlsl_ir_node *texel_offset, const struct vkd3d_shader_location *loc);
+ enum hlsl_resource_load_type type, struct hlsl_deref *resource, struct hlsl_deref *sampler,
+ struct hlsl_ir_node *coords, struct hlsl_ir_node *texel_offset, const struct vkd3d_shader_location *loc);
struct hlsl_ir_load *hlsl_new_load(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct hlsl_ir_node *offset,
struct hlsl_type *type, struct vkd3d_shader_location loc);
diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y
index b824ccef..ca1924a6 100644
--- a/libs/vkd3d-shader/hlsl.y
+++ b/libs/vkd3d-shader/hlsl.y
@@ -2400,10 +2400,8 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl
&& object_type->sampler_dim != HLSL_SAMPLER_DIM_CUBEARRAY)
{
const unsigned int sampler_dim = hlsl_sampler_dim_count(object_type->sampler_dim);
- struct hlsl_ir_node *object_load_offset;
struct hlsl_ir_resource_load *load;
struct hlsl_ir_node *coords;
- struct hlsl_block block;
if (object_type->sampler_dim == HLSL_SAMPLER_DIM_2DMS
|| object_type->sampler_dim == HLSL_SAMPLER_DIM_2DMSARRAY)
@@ -2428,11 +2426,8 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl
hlsl_get_vector_type(ctx, HLSL_TYPE_INT, sampler_dim + 1), loc)))
return false;
- object_load_offset = hlsl_new_offset_node_from_deref(ctx, &block, &object_load->src, loc);
- list_move_tail(instrs, &block.instrs);
-
if (!(load = hlsl_new_resource_load(ctx, object_type->e.resource_format, HLSL_RESOURCE_LOAD,
- object_load->src.var, object_load_offset, NULL, NULL, coords, NULL, loc)))
+ &object_load->src, NULL, coords, NULL, loc)))
return false;
list_add_tail(instrs, &load->node.entry);
return true;
@@ -2442,13 +2437,11 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl
&& object_type->sampler_dim != HLSL_SAMPLER_DIM_2DMSARRAY)
{
const unsigned int sampler_dim = hlsl_sampler_dim_count(object_type->sampler_dim);
- struct hlsl_ir_node *object_load_offset, *sampler_load_offset;
const struct hlsl_type *sampler_type;
struct hlsl_ir_resource_load *load;
struct hlsl_ir_node *offset = NULL;
struct hlsl_ir_load *sampler_load;
struct hlsl_ir_node *coords;
- struct hlsl_block block;
if (params->args_count != 2 && params->args_count != 3)
{
@@ -2484,15 +2477,8 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl
return false;
}
- object_load_offset = hlsl_new_offset_node_from_deref(ctx, &block, &object_load->src, loc);
- list_move_tail(instrs, &block.instrs);
-
- sampler_load_offset = hlsl_new_offset_node_from_deref(ctx, &block, &sampler_load->src, loc);
- list_move_tail(instrs, &block.instrs);
-
if (!(load = hlsl_new_resource_load(ctx, object_type->e.resource_format,
- HLSL_RESOURCE_SAMPLE, object_load->src.var, object_load_offset,
- sampler_load->src.var, sampler_load_offset, coords, offset, loc)))
+ HLSL_RESOURCE_SAMPLE, &object_load->src, &sampler_load->src, coords, offset, loc)))
return false;
list_add_tail(instrs, &load->node.entry);
@@ -2506,7 +2492,6 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl
|| object_type->sampler_dim == HLSL_SAMPLER_DIM_CUBEARRAY))
{
const unsigned int sampler_dim = hlsl_sampler_dim_count(object_type->sampler_dim);
- struct hlsl_ir_node *object_load_offset, *sampler_load_offset;
enum hlsl_resource_load_type load_type;
const struct hlsl_type *sampler_type;
struct hlsl_ir_resource_load *load;
@@ -2515,7 +2500,6 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl
struct hlsl_type *result_type;
struct hlsl_ir_node *coords;
unsigned int read_channel;
- struct hlsl_block block;
if (!strcmp(name, "GatherGreen"))
{
@@ -2597,15 +2581,8 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl
hlsl_get_vector_type(ctx, HLSL_TYPE_FLOAT, sampler_dim), loc)))
return false;
- object_load_offset = hlsl_new_offset_node_from_deref(ctx, &block, &object_load->src, loc);
- list_move_tail(instrs, &block.instrs);
-
- sampler_load_offset = hlsl_new_offset_node_from_deref(ctx, &block, &sampler_load->src, loc);
- list_move_tail(instrs, &block.instrs);
-
- if (!(load = hlsl_new_resource_load(ctx, result_type,
- load_type, object_load->src.var, object_load_offset,
- sampler_load->src.var, sampler_load_offset, coords, offset, loc)))
+ if (!(load = hlsl_new_resource_load(ctx, result_type, load_type, &object_load->src,
+ &sampler_load->src, coords, offset, loc)))
return false;
list_add_tail(instrs, &load->node.entry);
return true;
diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index 0b577f54..483ee9e1 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -31,6 +31,9 @@ static void replace_deref_path_with_offset(struct hlsl_ctx *ctx, struct hlsl_der
if (!deref->var)
return;
+ /* register offsets shouldn't be used before this point is reached. */
+ assert(!deref->offset.node);
+
if (!(offset = hlsl_new_offset_node_from_deref(ctx, &block, deref, &instr->loc)))
return;
list_move_before(&instr->entry, &block.instrs);
--
2.34.1
More information about the wine-devel
mailing list