From: Marek Olšák <marek.olsak@amd.com>
Date: Sat, 31 Jan 2015 17:58:19 +0000 (+0100)
Subject: gallium: set PIPE_MAX_SAMPLERS to 18
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b616429ca8ed99f3f891b7b5b362d757856bc5a7;p=mesa.git

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@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
index 43bc48bd336..e15860c4ca7 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