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

ir3: Add support for gl_ViewIndex in VS & FS

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5720>
This commit is contained in:
Connor Abbott
2020-07-01 16:46:22 +02:00
committed by Marge Bot
parent 4b163ff1eb
commit 5ef960e93c
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/freedreno/ir3/ir3_compiler_nir.c
View File

@@ -1861,6 +1861,12 @@ emit_intrinsic(struct ir3_context *ctx, nir_intrinsic_instr *intr)
}
dst[0] = ctx->base_instance;
break;
case nir_intrinsic_load_view_index:
if (!ctx->view_index) {
ctx->view_index = create_sysval_input(ctx, SYSTEM_VALUE_VIEW_INDEX, 0x1);
}
dst[0] = ctx->view_index;
break;
case nir_intrinsic_load_vertex_id_zero_base:
case nir_intrinsic_load_vertex_id:
if (!ctx->vertex_id) {

2
src/freedreno/ir3/ir3_context.h
View File

@@ -83,7 +83,7 @@ struct ir3_context {
struct ir3_instruction *frag_face, *frag_coord;
/* For vertex shaders, keep track of the system values sources */
struct ir3_instruction *vertex_id, *basevertex, *instance_id, *base_instance, *draw_id;
struct ir3_instruction *vertex_id, *basevertex, *instance_id, *base_instance, *draw_id, *view_index;
/* For fragment shaders: */
struct ir3_instruction *samp_id, *samp_mask_in;

9
src/freedreno/ir3/ir3_shader.h
View File

@@ -851,6 +851,9 @@ struct ir3_shader_linkage {
/* location for fixed-function gl_PrimitiveID passthrough */
uint8_t primid_loc;
/* location for fixed-function gl_ViewIndex passthrough */
uint8_t viewid_loc;
};
static inline void
@@ -891,6 +894,7 @@ ir3_link_shaders(struct ir3_shader_linkage *l,
int j = -1, k;
l->primid_loc = 0xff;
l->viewid_loc = 0xff;
while (l->cnt < ARRAY_SIZE(l->var)) {
j = ir3_next_varying(fs, j);
@@ -907,6 +911,11 @@ ir3_link_shaders(struct ir3_shader_linkage *l,
l->primid_loc = fs->inputs[j].inloc;
}
if (fs->inputs[j].slot == VARYING_SLOT_VIEW_INDEX) {
assert(k < 0);
l->viewid_loc = fs->inputs[j].inloc;
}
ir3_link_add(l, k >= 0 ? vs->outputs[k].regid : default_regid,
fs->inputs[j].compmask, fs->inputs[j].inloc);
}