[Mesa-dev] [PATCH] Revert "radeonsi: decrease the number of texture slots to 24"

[Samuel Pitoiset]

Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>

This should also fix the glActiveTexture() errors with The Wither 3.

On 02/02/2017 07:46 PM, Marek Olšák wrote:
> From: Marek Olšák <marek.olsak at amd.com>
>
> This reverts commit bdd860e3076655519d45bd66936ef7be9b7dda63.
>
> Requested by a game developer.
>
> Cc: 17.0 <mesa-stable at lists.freedesktop.org>
> ---
>  src/gallium/drivers/radeonsi/si_state.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h
> index 6bb0673..3f08f54 100644
> --- a/src/gallium/drivers/radeonsi/si_state.h
> +++ b/src/gallium/drivers/radeonsi/si_state.h
> @@ -28,21 +28,21 @@
>  #define SI_STATE_H
>
>  #include "si_pm4.h"
>  #include "radeon/r600_pipe_common.h"
>
>  #define SI_NUM_GRAPHICS_SHADERS (PIPE_SHADER_TESS_EVAL+1)
>  #define SI_NUM_SHADERS (PIPE_SHADER_COMPUTE+1)
>
>  #define SI_MAX_ATTRIBS			16
>  #define SI_NUM_VERTEX_BUFFERS		SI_MAX_ATTRIBS
> -#define SI_NUM_SAMPLERS			24 /* OpenGL textures units per shader */
> +#define SI_NUM_SAMPLERS			32 /* OpenGL textures units per shader */
>  #define SI_NUM_CONST_BUFFERS		16
>  #define SI_NUM_IMAGES			16
>  #define SI_NUM_SHADER_BUFFERS		16
>
>  struct si_screen;
>  struct si_shader;
>
>  struct si_state_blend {
>  	struct si_pm4_state	pm4;
>  	uint32_t		cb_target_mask;
>