diff options
author | Ian Romanick <[email protected]> | 2011-01-04 16:09:00 -0800 |
---|---|---|
committer | Ian Romanick <[email protected]> | 2011-01-06 10:06:59 -0800 |
commit | e942f328365309a1d8240cfe8eb5d88391015f37 (patch) | |
tree | 106383f28234c79ba990dd05d7cb9c3e3c0c549a /src/glsl/ast.h | |
parent | c60f1d8b007625f62a53010bb75e70462eb970ae (diff) |
glsl: Allow less restrictive uses of sampler array indexing in GLSL <= 1.20
GLSL 1.10 and 1.20 allow any sort of sampler array indexing.
Restrictions were added in GLSL 1.30. Commit f0f2ec4d added support
for the 1.30 restrictions, but it broke some valid 1.10/1.20 shaders.
This changes the error to a warning in GLSL 1.10, GLSL 1.20, and GLSL
ES 1.00.
There are some spurious whitespace changes in this commit. I changed
the layout (and wording) of the error message so that all three cases
would be similar. The 1.10/1.20 and 1.30 text is the same. The only
difference is that one is an error, and the other is a warning. The
GLSL ES 1.00 wording is similar but not quite the same.
Fixes piglit test
spec/glsl-1.10/compiler/constant-expressions/sampler-array-index-02.frag
and bugzilla #32374.
Diffstat (limited to 'src/glsl/ast.h')
0 files changed, 0 insertions, 0 deletions