diff --git a/src/gallium/auxiliary/gallivm/lp_bld_limits.h b/src/gallium/auxiliary/gallivm/lp_bld_limits.h
index dabd671aaf9..7c1d66ad19c 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_limits.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_limits.h
@@ -55,7 +55,7 @@
 
 #define LP_MAX_TGSI_CONST_BUFFER_SIZE (LP_MAX_TGSI_CONSTS * sizeof(float[4]))
 
-#define LP_MAX_TGSI_SHADER_BUFFERS 16
+#define LP_MAX_TGSI_SHADER_BUFFERS 32
 
 #define LP_MAX_TGSI_SHADER_BUFFER_SIZE (1 << 27)