mesa: Allow sampling from units >= MAX_TEXTURE_UNITS in shaders.
authorHenri Verbeet <hverbeet@gmail.com>
Sun, 3 Jul 2011 22:57:42 +0000 (00:57 +0200)
committerHenri Verbeet <hverbeet@gmail.com>
Thu, 7 Jul 2011 18:30:13 +0000 (20:30 +0200)
commit86adc2b29effb573c18eb0de7016cef605ab1edc
tree125f00c7d27759095218c084b5ae826b31c459ea
parent2e35d90fb9a50562d3c658d45a50e16623028d8e
mesa: Allow sampling from units >= MAX_TEXTURE_UNITS in shaders.

The total number of units used by a shader is limited to MAX_TEXTURE_UNITS,
but the actual indices are only limited by MAX_COMBINED_TEXTURE_IMAGE_UNITS,
since they're shared between vertex and fragment shaders.

NOTE: This is a candidate for the 7.11 branch.

Signed-off-by: Henri Verbeet <hverbeet@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
src/mesa/main/mtypes.h
src/mesa/main/shaderapi.c
src/mesa/main/uniforms.c