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

v3d: handle nir_intrinsic_store_tlb_sample_color_v3d

Browse Source 
v2:
 - Move handling of output intrinsics to ntq_emit_intrinsic() (Eric).

Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Iago Toral Quiroga
2019-07-16 11:20:11 +02:00
parent 50016d7718
commit 93d05c1c1f
1 changed files with 44 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1848,26 +1848,34 @@ ntq_emit_load_input(struct v3d_compile *c, nir_intrinsic_instr *instr)
} }
static void static void
ntq_emit_store_output(struct v3d_compile *c, nir_intrinsic_instr *instr) ntq_emit_per_sample_color_write(struct v3d_compile *c,
nir_intrinsic_instr *instr)
{ {
/* XXX perf: Use stvpmv with uniform non-constant offsets and assert(instr->intrinsic == nir_intrinsic_store_tlb_sample_color_v3d);
* stvpmd with non-uniform offsets and enable
* PIPE_SHADER_CAP_INDIRECT_OUTPUT_ADDR.
*/
if (c->s->info.stage == MESA_SHADER_FRAGMENT) {
unsigned offset = ((nir_intrinsic_base(instr) +
nir_src_as_uint(instr->src[1])) * 4 +
nir_intrinsic_component(instr));
for (int i = 0; i < instr->num_components; i++) {
c->outputs[offset + i] =
vir_MOV(c, ntq_get_src(c, instr->src[0], i));
}
} else {
assert(instr->num_components == 1);
vir_VPM_WRITE(c, unsigned rt = nir_src_as_uint(instr->src[1]);
ntq_get_src(c, instr->src[0], 0), assert(rt < V3D_MAX_DRAW_BUFFERS);
nir_intrinsic_base(instr));
unsigned sample_idx = nir_intrinsic_base(instr);
assert(sample_idx < V3D_MAX_SAMPLES);
unsigned offset = (rt * V3D_MAX_SAMPLES + sample_idx) * 4;
for (int i = 0; i < instr->num_components; i++) {
c->sample_colors[offset + i] =
vir_MOV(c, ntq_get_src(c, instr->src[0], i));
}
}
static void
ntq_emit_color_write(struct v3d_compile *c,
nir_intrinsic_instr *instr)
{
unsigned offset = (nir_intrinsic_base(instr) +
nir_src_as_uint(instr->src[1])) * 4 +
nir_intrinsic_component(instr);
for (int i = 0; i < instr->num_components; i++) {
c->outputs[offset + i] =
vir_MOV(c, ntq_get_src(c, instr->src[0], i));
} }
} }
@@ -2006,8 +2014,24 @@ ntq_emit_intrinsic(struct v3d_compile *c, nir_intrinsic_instr *instr)
ntq_emit_load_input(c, instr); ntq_emit_load_input(c, instr);
break; break;
case nir_intrinsic_store_output: case nir_intrinsic_store_tlb_sample_color_v3d:
ntq_emit_store_output(c, instr); ntq_emit_per_sample_color_write(c, instr);
break;
case nir_intrinsic_store_output:
/* XXX perf: Use stvpmv with uniform non-constant offsets and
* stvpmd with non-uniform offsets and enable
* PIPE_SHADER_CAP_INDIRECT_OUTPUT_ADDR.
*/
if (c->s->info.stage == MESA_SHADER_FRAGMENT) {
ntq_emit_color_write(c, instr);
} else {
assert(instr->num_components == 1);
vir_VPM_WRITE(c,
ntq_get_src(c, instr->src[0], 0),
nir_intrinsic_base(instr));
}
break; break;
case nir_intrinsic_image_deref_size: case nir_intrinsic_image_deref_size: