amd: remove support for LLVM 6.0

[mesa.git] / src / gallium / drivers / radeonsi / si_shader.h

diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h
index 09dd558d789d8ddaa08705240e71d8537521b388..f71e601574d0f5d341dd851c1aaf3d3830b195e5 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_shader.h
+++ b/src/gallium/drivers/radeonsi/si_shader.h
@@ -158,21 +158,9 @@ struct si_context;
 /* SGPR user data indices */
 enum {
        SI_SGPR_RW_BUFFERS,  /* rings (& stream-out, VS only) */
-#if !HAVE_32BIT_POINTERS
-       SI_SGPR_RW_BUFFERS_HI,
-#endif
        SI_SGPR_BINDLESS_SAMPLERS_AND_IMAGES,
-#if !HAVE_32BIT_POINTERS
-       SI_SGPR_BINDLESS_SAMPLERS_AND_IMAGES_HI,
-#endif
        SI_SGPR_CONST_AND_SHADER_BUFFERS, /* or just a constant buffer 0 pointer */
-#if !HAVE_32BIT_POINTERS
-       SI_SGPR_CONST_AND_SHADER_BUFFERS_HI,
-#endif
        SI_SGPR_SAMPLERS_AND_IMAGES,
-#if !HAVE_32BIT_POINTERS
-       SI_SGPR_SAMPLERS_AND_IMAGES_HI,
-#endif
        SI_NUM_RESOURCE_SGPRS,
 
        /* API VS, TES without GS, GS copy shader */
@@ -200,35 +188,20 @@ enum {
        GFX6_TCS_NUM_USER_SGPR,
 
        /* GFX9: Merged shaders. */
-#if HAVE_32BIT_POINTERS
        /* 2ND_CONST_AND_SHADER_BUFFERS is set in USER_DATA_ADDR_LO (SGPR0). */
        /* 2ND_SAMPLERS_AND_IMAGES is set in USER_DATA_ADDR_HI (SGPR1). */
        GFX9_MERGED_NUM_USER_SGPR = SI_VS_NUM_USER_SGPR,
-#else
-       /* 2ND_CONST_AND_SHADER_BUFFERS is set in USER_DATA_ADDR_LO/HI (SGPR[0:1]). */
-       GFX9_SGPR_2ND_SAMPLERS_AND_IMAGES = SI_VS_NUM_USER_SGPR,
-       GFX9_SGPR_2ND_SAMPLERS_AND_IMAGES_HI,
-       GFX9_MERGED_NUM_USER_SGPR,
-#endif
 
        /* GFX9: Merged LS-HS (VS-TCS) only. */
        GFX9_SGPR_TCS_OFFCHIP_LAYOUT = GFX9_MERGED_NUM_USER_SGPR,
        GFX9_SGPR_TCS_OUT_OFFSETS,
        GFX9_SGPR_TCS_OUT_LAYOUT,
-#if !HAVE_32BIT_POINTERS
-       GFX9_SGPR_align_for_vb_pointer,
-#endif
        GFX9_TCS_NUM_USER_SGPR,
 
        /* GS limits */
        GFX6_GS_NUM_USER_SGPR = SI_NUM_RESOURCE_SGPRS,
-#if HAVE_32BIT_POINTERS
        GFX9_VSGS_NUM_USER_SGPR = SI_VS_NUM_USER_SGPR,
        GFX9_TESGS_NUM_USER_SGPR = SI_TES_NUM_USER_SGPR,
-#else
-       GFX9_VSGS_NUM_USER_SGPR = GFX9_MERGED_NUM_USER_SGPR,
-       GFX9_TESGS_NUM_USER_SGPR = GFX9_MERGED_NUM_USER_SGPR,
-#endif
        SI_GSCOPY_NUM_USER_SGPR = SI_NUM_VS_STATE_RESOURCE_SGPRS,
 
        /* PS only */