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

v3d/compiler: implement nir_intrinsic_load_base_instance

Browse Source 
Vulkan lowers gl_InstanceIndex to load_base_instance +
load_instance_id, so we need to implement loading the base instance in
the compiler.

The base instance is set by the BASE_VERTEX_BASE_INSTANCE command
right before the instanced draw call and it is included in the VPM
payload together with the InstanceID and VertexID if this is requested
by the shader record.

Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6766>
This commit is contained in:
Iago Toral Quiroga
2020-04-08 08:49:36 +02:00
committed by Marge Bot
parent ee917d2b78
commit f41857eb48
3 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1560,10 +1560,14 @@ ntq_setup_vs_inputs(struct v3d_compile *c)
bool uses_iid = c->s->info.system_values_read & bool uses_iid = c->s->info.system_values_read &
(1ull << SYSTEM_VALUE_INSTANCE_ID | (1ull << SYSTEM_VALUE_INSTANCE_ID |
1ull << SYSTEM_VALUE_INSTANCE_INDEX); 1ull << SYSTEM_VALUE_INSTANCE_INDEX);
bool uses_biid = c->s->info.system_values_read &
(1ull << SYSTEM_VALUE_BASE_INSTANCE);
bool uses_vid = c->s->info.system_values_read & bool uses_vid = c->s->info.system_values_read &
(1ull << SYSTEM_VALUE_VERTEX_ID | (1ull << SYSTEM_VALUE_VERTEX_ID |
1ull << SYSTEM_VALUE_VERTEX_ID_ZERO_BASE); 1ull << SYSTEM_VALUE_VERTEX_ID_ZERO_BASE);
num_components += uses_iid; num_components += uses_iid;
num_components += uses_biid;
num_components += uses_vid; num_components += uses_vid;
for (int i = 0; i < ARRAY_SIZE(c->vattr_sizes); i++) for (int i = 0; i < ARRAY_SIZE(c->vattr_sizes); i++)
@@ -1574,6 +1578,11 @@ ntq_setup_vs_inputs(struct v3d_compile *c)
&num_components, ~0); &num_components, ~0);
} }
if (uses_biid) {
c->biid = ntq_emit_vpm_read(c, &vpm_components_queued,
&num_components, ~0);
}
if (uses_vid) { if (uses_vid) {
c->vid = ntq_emit_vpm_read(c, &vpm_components_queued, c->vid = ntq_emit_vpm_read(c, &vpm_components_queued,
&num_components, ~0); &num_components, ~0);
@@ -2002,6 +2011,10 @@ ntq_emit_load_input(struct v3d_compile *c, nir_intrinsic_instr *instr)
(1ull << SYSTEM_VALUE_INSTANCE_ID)) { (1ull << SYSTEM_VALUE_INSTANCE_ID)) {
index++; index++;
} }
if (c->s->info.system_values_read &
(1ull << SYSTEM_VALUE_BASE_INSTANCE)) {
index++;
}
if (c->s->info.system_values_read & if (c->s->info.system_values_read &
(1ull << SYSTEM_VALUE_VERTEX_ID)) { (1ull << SYSTEM_VALUE_VERTEX_ID)) {
index++; index++;
@@ -2252,6 +2265,10 @@ ntq_emit_intrinsic(struct v3d_compile *c, nir_intrinsic_instr *instr)
vir_REVF(c))); vir_REVF(c)));
break; break;
case nir_intrinsic_load_base_instance:
ntq_store_dest(c, &instr->dest, 0, vir_MOV(c, c->biid));
break;
case nir_intrinsic_load_instance_id: case nir_intrinsic_load_instance_id:
ntq_store_dest(c, &instr->dest, 0, vir_MOV(c, c->iid)); ntq_store_dest(c, &instr->dest, 0, vir_MOV(c, c->iid));
break; break;

10
src/broadcom/compiler/v3d_compiler.h
View File

@@ -585,9 +585,15 @@ struct v3d_compile {
struct qreg iid; struct qreg iid;
/** /**
* Vertex ID, which comes in before the vertex attribute payload * Base Instance ID, which comes in before the vertex attribute payload
* (after Instance ID) if the shader record requests it. * (after Instance ID) if the shader record requests it.
*/ */
struct qreg biid;
/**
* Vertex ID, which comes in before the vertex attribute payload
* (after Base Instance) if the shader record requests it.
*/
struct qreg vid; struct qreg vid;
/* Fragment shader payload regs. */ /* Fragment shader payload regs. */
@@ -714,7 +720,7 @@ struct v3d_prog_data {
struct v3d_vs_prog_data { struct v3d_vs_prog_data {
struct v3d_prog_data base; struct v3d_prog_data base;
bool uses_iid, uses_vid; bool uses_iid, uses_biid, uses_vid;
/* Number of components read from each vertex attribute. */ /* Number of components read from each vertex attribute. */
uint8_t vattr_sizes[V3D_MAX_VS_INPUTS / 4]; uint8_t vattr_sizes[V3D_MAX_VS_INPUTS / 4];

5
src/broadcom/compiler/vir.c
View File

@@ -639,12 +639,17 @@ v3d_vs_set_prog_data(struct v3d_compile *c,
(1ull << SYSTEM_VALUE_VERTEX_ID | (1ull << SYSTEM_VALUE_VERTEX_ID |
1ull << SYSTEM_VALUE_VERTEX_ID_ZERO_BASE)); 1ull << SYSTEM_VALUE_VERTEX_ID_ZERO_BASE));
prog_data->uses_biid = (c->s->info.system_values_read &
(1ull << SYSTEM_VALUE_BASE_INSTANCE));
prog_data->uses_iid = (c->s->info.system_values_read & prog_data->uses_iid = (c->s->info.system_values_read &
(1ull << SYSTEM_VALUE_INSTANCE_ID | (1ull << SYSTEM_VALUE_INSTANCE_ID |
1ull << SYSTEM_VALUE_INSTANCE_INDEX)); 1ull << SYSTEM_VALUE_INSTANCE_INDEX));
if (prog_data->uses_vid) if (prog_data->uses_vid)
prog_data->vpm_input_size++; prog_data->vpm_input_size++;
if (prog_data->uses_biid)
prog_data->vpm_input_size++;
if (prog_data->uses_iid) if (prog_data->uses_iid)
prog_data->vpm_input_size++; prog_data->vpm_input_size++;