Skip to content
Snippets Groups Projects

hlsl: Return hlsl_ir_node pointers from instruction constructors, part 5.

Merged Elizabeth Figura requested to merge zfigura/vkd3d:pr4 into master
1 file
+ 43
41
Compare changes
  • Side-by-side
  • Inline
@@ -62,7 +62,8 @@ static bool fold_abs(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct
return true;
}
static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct hlsl_ir_constant *src)
static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst,
const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src)
{
unsigned int k;
uint32_t u;
@@ -70,11 +71,11 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct
double d;
float f;
if (dst->node.data_type->dimx != src->node.data_type->dimx
|| dst->node.data_type->dimy != src->node.data_type->dimy)
if (dst_type->dimx != src->node.data_type->dimx
|| dst_type->dimy != src->node.data_type->dimy)
{
FIXME("Cast from %s to %s.\n", debug_hlsl_type(ctx, src->node.data_type),
debug_hlsl_type(ctx, dst->node.data_type));
debug_hlsl_type(ctx, dst_type));
return false;
}
@@ -122,23 +123,23 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct
vkd3d_unreachable();
}
switch (dst->node.data_type->base_type)
switch (dst_type->base_type)
{
case HLSL_TYPE_FLOAT:
case HLSL_TYPE_HALF:
dst->value.u[k].f = f;
dst->u[k].f = f;
break;
case HLSL_TYPE_DOUBLE:
dst->value.u[k].d = d;
dst->u[k].d = d;
break;
case HLSL_TYPE_INT:
dst->value.u[k].i = i;
dst->u[k].i = i;
break;
case HLSL_TYPE_UINT:
dst->value.u[k].u = u;
dst->u[k].u = u;
break;
case HLSL_TYPE_BOOL:
@@ -150,9 +151,10 @@ static bool fold_cast(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct
return true;
}
static bool fold_neg(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct hlsl_ir_constant *src)
static bool fold_neg(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst,
const struct hlsl_type *dst_type, const struct hlsl_ir_constant *src)
{
enum hlsl_base_type type = dst->node.data_type->base_type;
enum hlsl_base_type type = dst_type->base_type;
unsigned int k;
assert(type == src->node.data_type->base_type);
@@ -163,30 +165,30 @@ static bool fold_neg(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct
{
case HLSL_TYPE_FLOAT:
case HLSL_TYPE_HALF:
dst->value.u[k].f = -src->value.u[k].f;
dst->u[k].f = -src->value.u[k].f;
break;
case HLSL_TYPE_DOUBLE:
dst->value.u[k].d = -src->value.u[k].d;
dst->u[k].d = -src->value.u[k].d;
break;
case HLSL_TYPE_INT:
case HLSL_TYPE_UINT:
dst->value.u[k].u = -src->value.u[k].u;
dst->u[k].u = -src->value.u[k].u;
break;
default:
FIXME("Fold negation for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type));
FIXME("Fold negation for type %s.\n", debug_hlsl_type(ctx, dst_type));
return false;
}
}
return true;
}
static bool fold_add(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct hlsl_ir_constant *src1,
struct hlsl_ir_constant *src2)
static bool fold_add(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type,
const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2)
{
enum hlsl_base_type type = dst->node.data_type->base_type;
enum hlsl_base_type type = dst_type->base_type;
unsigned int k;
assert(type == src1->node.data_type->base_type);
@@ -198,32 +200,32 @@ static bool fold_add(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst, struct
{
case HLSL_TYPE_FLOAT:
case HLSL_TYPE_HALF:
dst->value.u[k].f = src1->value.u[k].f + src2->value.u[k].f;
dst->u[k].f = src1->value.u[k].f + src2->value.u[k].f;
break;
case HLSL_TYPE_DOUBLE:
dst->value.u[k].d = src1->value.u[k].d + src2->value.u[k].d;
dst->u[k].d = src1->value.u[k].d + src2->value.u[k].d;
break;
/* Handling HLSL_TYPE_INT through the unsigned field to avoid
* undefined behavior with signed integers in C. */
case HLSL_TYPE_INT:
case HLSL_TYPE_UINT:
dst->value.u[k].u = src1->value.u[k].u + src2->value.u[k].u;
dst->u[k].u = src1->value.u[k].u + src2->value.u[k].u;
break;
default:
FIXME("Fold addition for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type));
FIXME("Fold addition for type %s.\n", debug_hlsl_type(ctx, dst_type));
return false;
}
}
return true;
}
static bool fold_mul(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst,
struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2)
static bool fold_mul(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type,
const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2)
{
enum hlsl_base_type type = dst->node.data_type->base_type;
enum hlsl_base_type type = dst_type->base_type;
unsigned int k;
assert(type == src1->node.data_type->base_type);
@@ -235,32 +237,32 @@ static bool fold_mul(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst,
{
case HLSL_TYPE_FLOAT:
case HLSL_TYPE_HALF:
dst->value.u[k].f = src1->value.u[k].f * src2->value.u[k].f;
dst->u[k].f = src1->value.u[k].f * src2->value.u[k].f;
break;
case HLSL_TYPE_DOUBLE:
dst->value.u[k].d = src1->value.u[k].d * src2->value.u[k].d;
dst->u[k].d = src1->value.u[k].d * src2->value.u[k].d;
break;
case HLSL_TYPE_INT:
case HLSL_TYPE_UINT:
dst->value.u[k].u = src1->value.u[k].u * src2->value.u[k].u;
dst->u[k].u = src1->value.u[k].u * src2->value.u[k].u;
break;
default:
FIXME("Fold multiplication for type %s.\n", debug_hlsl_type(ctx, dst->node.data_type));
FIXME("Fold multiplication for type %s.\n", debug_hlsl_type(ctx, dst_type));
return false;
}
}
return true;
}
static bool fold_nequal(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst,
struct hlsl_ir_constant *src1, struct hlsl_ir_constant *src2)
static bool fold_nequal(struct hlsl_ctx *ctx, struct hlsl_constant_value *dst, const struct hlsl_type *dst_type,
const struct hlsl_ir_constant *src1, const struct hlsl_ir_constant *src2)
{
unsigned int k;
assert(dst->node.data_type->base_type == HLSL_TYPE_BOOL);
assert(dst_type->base_type == HLSL_TYPE_BOOL);
assert(src1->node.data_type->base_type == src2->node.data_type->base_type);
for (k = 0; k < 4; ++k)
@@ -269,24 +271,24 @@ static bool fold_nequal(struct hlsl_ctx *ctx, struct hlsl_ir_constant *dst,
{
case HLSL_TYPE_FLOAT:
case HLSL_TYPE_HALF:
dst->value.u[k].u = src1->value.u[k].f != src2->value.u[k].f;
dst->u[k].u = src1->value.u[k].f != src2->value.u[k].f;
break;
case HLSL_TYPE_DOUBLE:
dst->value.u[k].u = src1->value.u[k].d != src2->value.u[k].d;
dst->u[k].u = src1->value.u[k].d != src2->value.u[k].d;
break;
case HLSL_TYPE_INT:
case HLSL_TYPE_UINT:
case HLSL_TYPE_BOOL:
dst->value.u[k].u = src1->value.u[k].u != src2->value.u[k].u;
dst->u[k].u = src1->value.u[k].u != src2->value.u[k].u;
break;
default:
vkd3d_unreachable();
}
dst->value.u[k].u *= ~0u;
dst->u[k].u *= ~0u;
}
return true;
}
@@ -578,23 +580,23 @@ bool hlsl_fold_constant_exprs(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr,
break;
case HLSL_OP1_CAST:
success = fold_cast(ctx, res, arg1);
success = fold_cast(ctx, &res->value, instr->data_type, arg1);
break;
case HLSL_OP1_NEG:
success = fold_neg(ctx, res, arg1);
success = fold_neg(ctx, &res->value, instr->data_type, arg1);
break;
case HLSL_OP2_ADD:
success = fold_add(ctx, res, arg1, arg2);
success = fold_add(ctx, &res->value, instr->data_type, arg1, arg2);
break;
case HLSL_OP2_MUL:
success = fold_mul(ctx, res, arg1, arg2);
success = fold_mul(ctx, &res->value, instr->data_type, arg1, arg2);
break;
case HLSL_OP2_NEQUAL:
success = fold_nequal(ctx, res, arg1, arg2);
success = fold_nequal(ctx, &res->value, instr->data_type, arg1, arg2);
break;
case HLSL_OP2_DIV:
Loading