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/hlsl: Allow uint1-typed deref path nodes.

Browse Source 
When derefs with non-constant indices are copy-propagated, it is
possible to end up with uint1-typed path nodes.

Also, introduce hlsl_is_vec1().
This commit is contained in:
Shaun Ren
2025-02-20 22:13:57 -05:00
committed by Henri Verbeet
parent 766492d1cc
commit 1c2434f4d3
Notes: Henri Verbeet 2025-03-12 22:20:19 +01:00 
Approved-by: Francisco Casas (@fcasas)
Approved-by: Elizabeth Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1388
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/vkd3d-shader/hlsl.h
View File

@@ -1458,6 +1458,11 @@ static inline bool hlsl_is_numeric_type(const struct hlsl_type *type)
return type->class <= HLSL_CLASS_LAST_NUMERIC; return type->class <= HLSL_CLASS_LAST_NUMERIC;
} }
static inline bool hlsl_is_vec1(const struct hlsl_type *type)
{
return type->class == HLSL_CLASS_SCALAR || (type->class == HLSL_CLASS_VECTOR && type->e.numeric.dimx == 1);
}
static inline unsigned int hlsl_sampler_dim_count(enum hlsl_sampler_dim dim) static inline unsigned int hlsl_sampler_dim_count(enum hlsl_sampler_dim dim)
{ {
switch (dim) switch (dim)

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

@@ -2167,8 +2167,7 @@ static enum validation_result validate_component_index_range_from_deref(struct h
return DEREF_VALIDATION_NOT_CONSTANT; return DEREF_VALIDATION_NOT_CONSTANT;
/* We should always have generated a cast to UINT. */ /* We should always have generated a cast to UINT. */
VKD3D_ASSERT(path_node->data_type->class == HLSL_CLASS_SCALAR VKD3D_ASSERT(hlsl_is_vec1(path_node->data_type) && path_node->data_type->e.numeric.type == HLSL_TYPE_UINT);
&& path_node->data_type->e.numeric.type == HLSL_TYPE_UINT);
idx = hlsl_ir_constant(path_node)->value.u[0].u; idx = hlsl_ir_constant(path_node)->value.u[0].u;
@@ -2325,11 +2324,6 @@ static bool validate_dereferences(struct hlsl_ctx *ctx, struct hlsl_ir_node *ins
return false; return false;
} }
static bool is_vec1(const struct hlsl_type *type)
{
return (type->class == HLSL_CLASS_SCALAR) || (type->class == HLSL_CLASS_VECTOR && type->e.numeric.dimx == 1);
}
static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context) static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, void *context)
{ {
if (instr->type == HLSL_IR_EXPR) if (instr->type == HLSL_IR_EXPR)
@@ -2344,7 +2338,8 @@ static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *inst
src_type = expr->operands[0].node->data_type; src_type = expr->operands[0].node->data_type;
if (hlsl_types_are_equal(src_type, dst_type) if (hlsl_types_are_equal(src_type, dst_type)
|| (src_type->e.numeric.type == dst_type->e.numeric.type && is_vec1(src_type) && is_vec1(dst_type))) || (src_type->e.numeric.type == dst_type->e.numeric.type
&& hlsl_is_vec1(src_type) && hlsl_is_vec1(dst_type)))
{ {
hlsl_replace_node(&expr->node, expr->operands[0].node); hlsl_replace_node(&expr->node, expr->operands[0].node);
return true; return true;
@@ -5928,8 +5923,7 @@ bool hlsl_component_index_range_from_deref(struct hlsl_ctx *ctx, const struct hl
return false; return false;
/* We should always have generated a cast to UINT. */ /* We should always have generated a cast to UINT. */
VKD3D_ASSERT(path_node->data_type->class == HLSL_CLASS_SCALAR VKD3D_ASSERT(hlsl_is_vec1(path_node->data_type) && path_node->data_type->e.numeric.type == HLSL_TYPE_UINT);
&& path_node->data_type->e.numeric.type == HLSL_TYPE_UINT);
idx = hlsl_ir_constant(path_node)->value.u[0].u; idx = hlsl_ir_constant(path_node)->value.u[0].u;
@@ -5992,8 +5986,7 @@ bool hlsl_regset_index_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref
if (path_node->type == HLSL_IR_CONSTANT) if (path_node->type == HLSL_IR_CONSTANT)
{ {
/* We should always have generated a cast to UINT. */ /* We should always have generated a cast to UINT. */
VKD3D_ASSERT(path_node->data_type->class == HLSL_CLASS_SCALAR VKD3D_ASSERT(hlsl_is_vec1(path_node->data_type) && path_node->data_type->e.numeric.type == HLSL_TYPE_UINT);
&& path_node->data_type->e.numeric.type == HLSL_TYPE_UINT);
idx = hlsl_ir_constant(path_node)->value.u[0].u; idx = hlsl_ir_constant(path_node)->value.u[0].u;
@@ -6061,8 +6054,7 @@ bool hlsl_offset_from_deref(struct hlsl_ctx *ctx, const struct hlsl_deref *deref
if (offset_node) if (offset_node)
{ {
/* We should always have generated a cast to UINT. */ /* We should always have generated a cast to UINT. */
VKD3D_ASSERT(offset_node->data_type->class == HLSL_CLASS_SCALAR VKD3D_ASSERT(hlsl_is_vec1(offset_node->data_type) && offset_node->data_type->e.numeric.type == HLSL_TYPE_UINT);
&& offset_node->data_type->e.numeric.type == HLSL_TYPE_UINT);
VKD3D_ASSERT(offset_node->type != HLSL_IR_CONSTANT); VKD3D_ASSERT(offset_node->type != HLSL_IR_CONSTANT);
return false; return false;
} }