Mesa (main): freedreno, tu: Set GRAS_LRZ_PS_INPUT_CNTL::SAMPLEID

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 277ac9c30fa4c481f7f8149397b65ed74b94c3f6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=277ac9c30fa4c481f7f8149397b65ed74b94c3f6

Author: Connor Abbott <cwabbott0 at gmail.com>
Date:   Thu Aug 12 14:55:56 2021 +0200

freedreno, tu: Set GRAS_LRZ_PS_INPUT_CNTL::SAMPLEID

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12340>

---

 src/freedreno/vulkan/tu_pipeline.c               | 3 ++-
 src/gallium/drivers/freedreno/a6xx/fd6_program.c | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/freedreno/vulkan/tu_pipeline.c b/src/freedreno/vulkan/tu_pipeline.c
index 0649ffcf847..43e77e93b36 100644
--- a/src/freedreno/vulkan/tu_pipeline.c
+++ b/src/freedreno/vulkan/tu_pipeline.c
@@ -1426,7 +1426,8 @@ tu6_emit_fs_inputs(struct tu_cs *cs, const struct ir3_shader_variant *fs)
    tu_cs_emit(cs, COND(sample_shading, A6XX_RB_SAMPLE_CNTL_PER_SAMP_MODE));
 
    tu_cs_emit_pkt4(cs, REG_A6XX_GRAS_LRZ_PS_INPUT_CNTL, 1);
-   tu_cs_emit(cs, A6XX_GRAS_LRZ_PS_INPUT_CNTL_FRAGCOORDSAMPLEMODE(
+   tu_cs_emit(cs, CONDREG(samp_id_regid, A6XX_GRAS_LRZ_PS_INPUT_CNTL_SAMPLEID) |
+              A6XX_GRAS_LRZ_PS_INPUT_CNTL_FRAGCOORDSAMPLEMODE(
                  sample_shading ? FRAGCOORD_SAMPLE : FRAGCOORD_CENTER));
 
    tu_cs_emit_pkt4(cs, REG_A6XX_GRAS_SAMPLE_CNTL, 1);
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_program.c b/src/gallium/drivers/freedreno/a6xx/fd6_program.c
index 3ed5a642d4c..cfcd72f8de3 100644
--- a/src/gallium/drivers/freedreno/a6xx/fd6_program.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_program.c
@@ -817,8 +817,10 @@ setup_stateobj(struct fd_ringbuffer *ring, struct fd_context *ctx,
    OUT_RING(ring, COND(sample_shading, A6XX_RB_SAMPLE_CNTL_PER_SAMP_MODE));
 
    OUT_PKT4(ring, REG_A6XX_GRAS_LRZ_PS_INPUT_CNTL, 1);
-   OUT_RING(ring, A6XX_GRAS_LRZ_PS_INPUT_CNTL_FRAGCOORDSAMPLEMODE(
-         sample_shading ? FRAGCOORD_SAMPLE : FRAGCOORD_CENTER));
+   OUT_RING(ring,
+         CONDREG(samp_id_regid, A6XX_GRAS_LRZ_PS_INPUT_CNTL_SAMPLEID) |
+         A6XX_GRAS_LRZ_PS_INPUT_CNTL_FRAGCOORDSAMPLEMODE(
+            sample_shading ? FRAGCOORD_SAMPLE : FRAGCOORD_CENTER));
 
    OUT_PKT4(ring, REG_A6XX_GRAS_SAMPLE_CNTL, 1);
    OUT_RING(ring, COND(sample_shading, A6XX_GRAS_SAMPLE_CNTL_PER_SAMP_MODE));