From d9a0c54f6f9811cfe6411a0ed4af8a1086b01b9d Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Sun, 1 May 2016 20:35:40 +0200 Subject: [PATCH] radeonsi: Use correct parameter index for LS_OUT_LAYOUT. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This happens to be in the right position, but that changes when TCS/TES get new parameters. Signed-off-by: Bas Nieuwenhuizen Reviewed-by: Nicolai Hähnle Reviewed-by: Marek Olšák --- src/gallium/drivers/radeonsi/si_shader.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h index 61ddcd16328..7b1cbf9f6b0 100644 --- a/src/gallium/drivers/radeonsi/si_shader.h +++ b/src/gallium/drivers/radeonsi/si_shader.h @@ -141,8 +141,10 @@ enum { SI_PARAM_VERTEX_BUFFERS = SI_NUM_RESOURCE_PARAMS, SI_PARAM_BASE_VERTEX, SI_PARAM_START_INSTANCE, - /* [0] = clamp vertex color */ + /* [0] = clamp vertex color, VS as VS only */ SI_PARAM_VS_STATE_BITS, + /* same value as TCS_IN_LAYOUT, VS as LS only */ + SI_PARAM_LS_OUT_LAYOUT = SI_PARAM_START_INSTANCE + 1, /* the other VS parameters are assigned dynamically */ /* Offsets where TCS outputs and TCS patch outputs live in LDS: @@ -163,10 +165,9 @@ enum { * [13:20] = stride between vertices in dwords = num_inputs * 4, max = 32*4 */ SI_PARAM_TCS_IN_LAYOUT, /* TCS only */ - SI_PARAM_LS_OUT_LAYOUT, /* same value as TCS_IN_LAYOUT, LS only */ /* TCS only parameters. */ - SI_PARAM_TCS_OC_LDS = SI_PARAM_TCS_IN_LAYOUT + 1, + SI_PARAM_TCS_OC_LDS, SI_PARAM_TESS_FACTOR_OFFSET, SI_PARAM_PATCH_ID, SI_PARAM_REL_IDS, -- 2.30.2