pan/bi: Use canonical lane ops

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8213>
This commit is contained in:
Alyssa Rosenzweig 2020-11-27 13:30:01 -05:00 committed by Marge Bot
parent 876f37ed59
commit c41cecd404
2 changed files with 8 additions and 8 deletions

View file

@ -235,7 +235,7 @@ bi_emit_deriv(bi_context *ctx, nir_alu_instr *instr)
.type = BI_SPECIAL_ADD,
.op.special = ctx->arch == 6 ? BI_SPECIAL_CLPER_V6 : BI_SPECIAL_CLPER_V7,
.special.subgroup_sz = BI_CLPER_SUBGROUP_SZ_4,
.special.clper.lane_op_mod = BI_CLPER_LANE_OP_MOD_NONE,
.special.clper.lane_op_mod = BI_LANE_OP_NONE,
.special.clper.inactive_res = BI_CLPER_INACTIVE_RES_ZERO,
.dest = bi_make_temp(ctx),
.dest_type = nir_type_uint32,
@ -248,7 +248,7 @@ bi_emit_deriv(bi_context *ctx, nir_alu_instr *instr)
.type = BI_SPECIAL_ADD,
.op.special = ctx->arch == 6 ? BI_SPECIAL_CLPER_V6 : BI_SPECIAL_CLPER_V7,
.special.subgroup_sz = BI_CLPER_SUBGROUP_SZ_4,
.special.clper.lane_op_mod = BI_CLPER_LANE_OP_MOD_NONE,
.special.clper.lane_op_mod = BI_LANE_OP_NONE,
.special.clper.inactive_res = BI_CLPER_INACTIVE_RES_ZERO,
.dest = bi_make_temp(ctx),
.dest_type = nir_type_uint32,

View file

@ -268,11 +268,11 @@ struct bi_texture {
bool compute_lod;
};
enum bi_clper_lane_op_mod {
BI_CLPER_LANE_OP_MOD_NONE,
BI_CLPER_LANE_OP_MOD_XOR,
BI_CLPER_LANE_OP_MOD_ACCUMULATE,
BI_CLPER_LANE_OP_MOD_SHIFT,
enum bi_lane_op {
BI_LANE_OP_NONE,
BI_LANE_OP_XOR,
BI_LANE_OP_ACCUMULATE,
BI_LANE_OP_SHIFT,
};
enum bi_subgroup_sz {
@ -302,7 +302,7 @@ enum bi_clper_inactive_res {
struct bi_special {
struct {
enum bi_clper_lane_op_mod lane_op_mod;
enum bi_lane_op lane_op_mod;
enum bi_clper_inactive_res inactive_res;
} clper;
enum bi_subgroup_sz subgroup_sz;