diff options
author | Lars Hamre <[email protected]> | 2016-04-08 10:06:23 -0400 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2016-04-09 11:06:04 +1000 |
commit | e25c24c6389e5dbbb7ebf59c302659e5d6417ed4 (patch) | |
tree | 8d6109bc96ee4515798d206b8c5479f50ce2bfb2 /src/glx/dri2.c | |
parent | 6cc7aec5b05ff19d9bdf2b33c993257625d7c9fc (diff) |
glsl: handle unsigned int wraparound in link_shaders()
v2: change check_explicit_uniform_locations() to return an
unsigned 0 (Timothy Arceri)
We were storing the int result of check_explicit_uniform_locations()
in num_explicit_uniform_locs as an unsigned int which caused it to
be 4294967295 when a -1 was returned.
This in turn would cause the following error during linking:
error: count of uniform locations > MAX_UNIFORM_LOCATIONS(4294967295 > 98304)
Results from running piglit tests/all with this patch
and when ARB_explicit_uniform_location disabled:
changes: 178
fixes: 176
regressions: 2
The two regressions are for the following tests:
glean@glsl1-matrix column check (1)
glean@glsl1-matrix column check (2)
which regress from FAIL to CRASH.
The regressions are acceptable because the tests are currently failing due to
the aforementioned linker error.
Signed-off-by: Lars Hamre <[email protected]>
Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src/glx/dri2.c')
0 files changed, 0 insertions, 0 deletions