OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v3d: refactor the tlb color write code

Browse Source 
We want to split the tlb specifier setup from the color writes, because when
we implement per-sample color writes we want to do the latter for all the
samples, but the former only once.

Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Iago Toral Quiroga
2019-07-16 10:28:53 +02:00
parent fd3ec6f55d
commit b96c2219ca
1 changed files with 39 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/broadcom/compiler/nir_to_vir.c
View File

@@ -1131,32 +1131,21 @@ vir_emit_tlb_color_write(struct v3d_compile *c, unsigned rt)
if (c->fs_key->swap_color_rb & (1 << rt)) if (c->fs_key->swap_color_rb & (1 << rt))
num_components = MAX2(num_components, 3); num_components = MAX2(num_components, 3);
assert(num_components != 0); assert(num_components != 0);
switch (glsl_get_base_type(var->type)) {
case GLSL_TYPE_UINT: enum glsl_base_type type = glsl_get_base_type(var->type);
case GLSL_TYPE_INT: bool is_int_format = type == GLSL_TYPE_INT || type == GLSL_TYPE_UINT;
bool is_32b_tlb_format = is_int_format ||
(c->fs_key->f32_color_rb & (1 << rt));
if (is_int_format) {
/* The F32 vs I32 distinction was dropped in 4.2. */ /* The F32 vs I32 distinction was dropped in 4.2. */
if (c->devinfo->ver < 42) if (c->devinfo->ver < 42)
conf |= TLB_TYPE_I32_COLOR; conf |= TLB_TYPE_I32_COLOR;
else else
conf |= TLB_TYPE_F32_COLOR; conf |= TLB_TYPE_F32_COLOR;
conf |= ((num_components - 1) << TLB_VEC_SIZE_MINUS_1_SHIFT); conf |= ((num_components - 1) << TLB_VEC_SIZE_MINUS_1_SHIFT);
} else {
inst = vir_MOV_dest(c, tlbu_reg, color[0]);
inst->uniform =
vir_get_uniform_index(c, QUNIFORM_CONSTANT, conf);
for (int i = 1; i < num_components; i++)
inst = vir_MOV_dest(c, tlb_reg, color[i]);
break;
default: {
struct qreg r = color[0];
struct qreg g = color[1];
struct qreg b = color[2];
struct qreg a = color[3];
if (c->fs_key->f32_color_rb & (1 << rt)) { if (c->fs_key->f32_color_rb & (1 << rt)) {
conf |= TLB_TYPE_F32_COLOR; conf |= TLB_TYPE_F32_COLOR;
conf |= ((num_components - 1) << conf |= ((num_components - 1) <<
@@ -1169,6 +1158,12 @@ vir_emit_tlb_color_write(struct v3d_compile *c, unsigned rt)
else else
conf |= TLB_VEC_SIZE_2_F16; conf |= TLB_VEC_SIZE_2_F16;
} }
}
struct qreg r = color[0];
struct qreg g = color[1];
struct qreg b = color[2];
struct qreg a = color[3];
if (c->fs_key->swap_color_rb & (1 << rt)) { if (c->fs_key->swap_color_rb & (1 << rt)) {
r = color[2]; r = color[2];
@@ -1178,11 +1173,10 @@ vir_emit_tlb_color_write(struct v3d_compile *c, unsigned rt)
if (c->fs_key->sample_alpha_to_one) if (c->fs_key->sample_alpha_to_one)
a = vir_uniform_f(c, 1.0); a = vir_uniform_f(c, 1.0);
if (c->fs_key->f32_color_rb & (1 << rt)) { if (is_32b_tlb_format) {
inst = vir_MOV_dest(c, tlbu_reg, r); inst = vir_MOV_dest(c, tlbu_reg, r);
inst->uniform = inst->uniform =
vir_get_uniform_index(c, QUNIFORM_CONSTANT, vir_get_uniform_index(c, QUNIFORM_CONSTANT, conf);
conf);
if (num_components >= 2) if (num_components >= 2)
vir_MOV_dest(c, tlb_reg, g); vir_MOV_dest(c, tlb_reg, g);
@@ -1194,8 +1188,7 @@ vir_emit_tlb_color_write(struct v3d_compile *c, unsigned rt)
inst = vir_VFPACK_dest(c, tlb_reg, r, g); inst = vir_VFPACK_dest(c, tlb_reg, r, g);
if (conf != ~0) { if (conf != ~0) {
inst->dst = tlbu_reg; inst->dst = tlbu_reg;
inst->uniform = inst->uniform = vir_get_uniform_index(c,
vir_get_uniform_index(c,
QUNIFORM_CONSTANT, QUNIFORM_CONSTANT,
conf); conf);
} }
@@ -1203,9 +1196,6 @@ vir_emit_tlb_color_write(struct v3d_compile *c, unsigned rt)
if (num_components >= 3) if (num_components >= 3)
inst = vir_VFPACK_dest(c, tlb_reg, b, a); inst = vir_VFPACK_dest(c, tlb_reg, b, a);
} }
break;
} /* default */
} /* Switch */
} }
static void static void