Mesa (main): radeonsi: remove GFX9_MERGED_NUM_USER_SGPR definition

[GitLab Mirror]

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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Wed May 11 03:50:03 2022 -0400

radeonsi: remove GFX9_MERGED_NUM_USER_SGPR definition

Reviewed-by: Mihai Preda <mhpreda at gmail.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16509>

---

 src/gallium/drivers/radeonsi/si_shader.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h
index a7417461e00..d45d2e27fee 100644
--- a/src/gallium/drivers/radeonsi/si_shader.h
+++ b/src/gallium/drivers/radeonsi/si_shader.h
@@ -199,13 +199,8 @@ enum
    GFX6_SGPR_TCS_IN_LAYOUT,
    GFX6_TCS_NUM_USER_SGPR,
 
-   /* GFX9: Merged shaders. */
-   /* 2ND_CONST_AND_SHADER_BUFFERS is set in USER_DATA_ADDR_LO/PGM_LO (SGPR0). */
-   /* 2ND_SAMPLERS_AND_IMAGES is set in USER_DATA_ADDR_HI/PGM_HI (SGPR1). */
-   GFX9_MERGED_NUM_USER_SGPR = SI_VS_NUM_USER_SGPR,
-
    /* GFX9: Merged LS-HS (VS-TCS) only. */
-   GFX9_SGPR_TCS_OFFCHIP_LAYOUT = GFX9_MERGED_NUM_USER_SGPR,
+   GFX9_SGPR_TCS_OFFCHIP_LAYOUT = SI_VS_NUM_USER_SGPR,
    GFX9_SGPR_TCS_OUT_OFFSETS,
    GFX9_SGPR_TCS_OUT_LAYOUT,
    GFX9_TCS_NUM_USER_SGPR,