From: Bas Nieuwenhuizen Date: Mon, 16 Oct 2017 22:01:33 +0000 (+0200) Subject: ac/nir: Expand user SGPR descriptions a bit. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=56d8af1ec540a608fc6bf766f3bb4f946f95579f;p=mesa.git ac/nir: Expand user SGPR descriptions a bit. To prevent VS/TCS collisions in merged shaders. Reviewed-by: Dave Airlie --- diff --git a/src/amd/common/ac_nir_to_llvm.h b/src/amd/common/ac_nir_to_llvm.h index 66d539dec47..360d613d58d 100644 --- a/src/amd/common/ac_nir_to_llvm.h +++ b/src/amd/common/ac_nir_to_llvm.h @@ -103,13 +103,13 @@ enum ac_ud_index { AC_UD_PS_MAX_UD, AC_UD_CS_GRID_SIZE = AC_UD_SHADER_START, AC_UD_CS_MAX_UD, - AC_UD_GS_VS_RING_STRIDE_ENTRIES = AC_UD_SHADER_START, + AC_UD_GS_VS_RING_STRIDE_ENTRIES = AC_UD_VS_MAX_UD, AC_UD_GS_MAX_UD, - AC_UD_TCS_OFFCHIP_LAYOUT = AC_UD_SHADER_START, + AC_UD_TCS_OFFCHIP_LAYOUT = AC_UD_VS_MAX_UD, AC_UD_TCS_MAX_UD, AC_UD_TES_OFFCHIP_LAYOUT = AC_UD_SHADER_START, AC_UD_TES_MAX_UD, - AC_UD_MAX_UD = AC_UD_VS_MAX_UD, + AC_UD_MAX_UD = AC_UD_TCS_MAX_UD, }; /* descriptor index into scratch ring offsets */