diff options
| author | Henri Verbeet <hverbeet@gmail.com> | 2011-07-04 00:57:42 +0200 |
|---|---|---|
| committer | Henri Verbeet <hverbeet@gmail.com> | 2011-07-07 20:30:13 +0200 |
| commit | 86adc2b29effb573c18eb0de7016cef605ab1edc (patch) | |
| tree | 125f00c7d27759095218c084b5ae826b31c459ea /src/mesa/main/shaderapi.c | |
| parent | 2e35d90fb9a50562d3c658d45a50e16623028d8e (diff) | |
| download | external_mesa3d-86adc2b29effb573c18eb0de7016cef605ab1edc.zip external_mesa3d-86adc2b29effb573c18eb0de7016cef605ab1edc.tar.gz external_mesa3d-86adc2b29effb573c18eb0de7016cef605ab1edc.tar.bz2 | |
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>
Diffstat (limited to 'src/mesa/main/shaderapi.c')
| -rw-r--r-- | src/mesa/main/shaderapi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index b58e30d..cb02e43 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -1032,7 +1032,7 @@ validate_samplers(const struct gl_program *prog, char *errMsg) "TEXTURE_2D", "TEXTURE_1D", }; - GLint targetUsed[MAX_TEXTURE_IMAGE_UNITS]; + GLint targetUsed[MAX_COMBINED_TEXTURE_IMAGE_UNITS]; GLbitfield samplersUsed = prog->SamplersUsed; GLuint i; |