Mesa (master): freedreno/a6xx: Implement PrimID passthrough
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sat Apr 25 01:16:38 UTC 2020
Module: Mesa
Branch: master
Commit: a64d2661340a659bdd0b729090b3aa6c135e8b4c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a64d2661340a659bdd0b729090b3aa6c135e8b4c
Author: Connor Abbott <cwabbott0 at gmail.com>
Date: Thu Apr 23 11:56:07 2020 +0200
freedreno/a6xx: Implement PrimID passthrough
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4704>
---
src/gallium/drivers/freedreno/a6xx/fd6_emit.c | 1 -
src/gallium/drivers/freedreno/a6xx/fd6_program.c | 11 +++++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_emit.c b/src/gallium/drivers/freedreno/a6xx/fd6_emit.c
index 59c2d15a266..9295175404d 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_emit.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_emit.c
@@ -1302,7 +1302,6 @@ fd6_emit_restore(struct fd_batch *batch, struct fd_ringbuffer *ring)
WRITE(REG_A6XX_VPC_SO_OVERRIDE, A6XX_VPC_SO_OVERRIDE_SO_DISABLE);
- WRITE(REG_A6XX_PC_PRIMID_CNTL, 0);
WRITE(REG_A6XX_PC_UNKNOWN_9990, 0);
WRITE(REG_A6XX_PC_UNKNOWN_9980, 0);
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_program.c b/src/gallium/drivers/freedreno/a6xx/fd6_program.c
index 9e12cb246c9..6e19deee03e 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_program.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_program.c
@@ -431,6 +431,8 @@ setup_stateobj(struct fd_ringbuffer *ring, struct fd_screen *screen,
const struct ir3_shader_variant *last_shader = fd6_last_shader(state);
ir3_link_shaders(&l, last_shader, fs, true);
+ bool primid_passthru = l.primid_loc != 0xff;
+
OUT_PKT4(ring, REG_A6XX_VPC_VAR_DISABLE(0), 4);
OUT_RING(ring, ~l.varmask[0]); /* VPC_VAR[0].DISABLE */
OUT_RING(ring, ~l.varmask[1]); /* VPC_VAR[1].DISABLE */
@@ -590,7 +592,8 @@ setup_stateobj(struct fd_ringbuffer *ring, struct fd_screen *screen,
OUT_PKT4(ring, REG_A6XX_VPC_CNTL_0, 1);
OUT_RING(ring, A6XX_VPC_CNTL_0_NUMNONPOSVAR(fs->total_in) |
COND(enable_varyings, A6XX_VPC_CNTL_0_VARYING) |
- 0xff00ff00);
+ A6XX_VPC_CNTL_0_PRIMIDLOC(l.primid_loc) |
+ A6XX_VPC_CNTL_0_UNKLOC(0xff));
OUT_PKT4(ring, REG_A6XX_PC_PRIMITIVE_CNTL_1, 1);
OUT_RING(ring, A6XX_PC_PRIMITIVE_CNTL_1_STRIDE_IN_VPC(l.max_loc) |
@@ -786,6 +789,9 @@ setup_stateobj(struct fd_ringbuffer *ring, struct fd_screen *screen,
if (fs->instrlen)
fd6_emit_shader(ring, fs);
+ OUT_PKT4(ring, REG_A6XX_PC_PRIMID_CNTL, 1);
+ OUT_RING(ring, COND(primid_passthru, A6XX_PC_PRIMID_CNTL_PRIMID_PASSTHRU));
+
OUT_PKT4(ring, REG_A6XX_VFD_CONTROL_1, 6);
OUT_RING(ring, A6XX_VFD_CONTROL_1_REGID4VTX(vertex_regid) |
A6XX_VFD_CONTROL_1_REGID4INST(instance_regid) |
@@ -800,7 +806,8 @@ setup_stateobj(struct fd_ringbuffer *ring, struct fd_screen *screen,
OUT_RING(ring, 0x000000fc); /* VFD_CONTROL_4 */
OUT_RING(ring, A6XX_VFD_CONTROL_5_REGID_GSHEADER(gs_header_regid) |
0xfc00); /* VFD_CONTROL_5 */
- OUT_RING(ring, 0x00000000); /* VFD_CONTROL_6 */
+ OUT_RING(ring,
+ COND(primid_passthru, A6XX_VFD_CONTROL_6_PRIMID_PASSTHRU)); /* VFD_CONTROL_6 */
bool fragz = fs->no_earlyz | fs->writes_pos;
More information about the mesa-commit
mailing list