Mesa (master): gallium: set PIPE_MAX_SAMPLERS to 18

Marek Olšák mareko at kemper.freedesktop.org
Wed Feb 4 13:38:15 UTC 2015


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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sat Jan 31 18:58:19 2015 +0100

gallium: set PIPE_MAX_SAMPLERS to 18

For drivers that use higher slots not to crash in tgsi_shader_info.

Reviewed-by: Glenn Kennard <glenn.kennard at gmail.com>
Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/gallium/include/pipe/p_state.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
index 43bc48b..e15860c 100644
--- a/src/gallium/include/pipe/p_state.h
+++ b/src/gallium/include/pipe/p_state.h
@@ -57,7 +57,7 @@ extern "C" {
 #define PIPE_MAX_CLIP_PLANES       8
 #define PIPE_MAX_COLOR_BUFS        8
 #define PIPE_MAX_CONSTANT_BUFFERS 32
-#define PIPE_MAX_SAMPLERS         16
+#define PIPE_MAX_SAMPLERS         18 /* 16 public + 2 driver internal */
 #define PIPE_MAX_SHADER_INPUTS    32
 #define PIPE_MAX_SHADER_OUTPUTS   48 /* 32 GENERICs + POS, PSIZE, FOG, etc. */
 #define PIPE_MAX_SHADER_SAMPLER_VIEWS 32




More information about the mesa-commit mailing list