KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "i965: fix problem with constant out of bounds access (v2)" 

This reverts commit 98dfd59a04.

The patch was clearly not Piglit tested, as it caused at least 225
tests to start crashing with assertion failures.  That was before my
desktop tanked and the test run died completely.
This commit is contained in:
Kenneth Graunke 2013-05-29 23:27:45 -07:00
parent 8b1c9de166
commit 60f9b722ef
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mesa/drivers/dri/i965/brw_fs.cpp
View File

@ -1504,13 +1504,7 @@ fs_visitor::remove_dead_constants()
if (inst->src[i].file != UNIFORM)
continue;
/* if we get a negative constant nr or one greater than we can
* handle, this can cause an overflow, we can't just refuse to
* build, so just go undefined and alias everyone to constant 0.
*/
if (constant_nr < 0 || constant_nr >= (int)c->prog_data.nr_params) {
constant_nr = 0;
}
assert(constant_nr < (int)c->prog_data.nr_params);
/* For now, set this to non-negative. We'll give it the
* actual new number in a moment, in order to keep the
@ -1558,10 +1552,6 @@ fs_visitor::remove_dead_constants()
if (inst->src[i].file != UNIFORM)
continue;
/* as above alias to 0 */
if (constant_nr < 0 || constant_nr >= (int)c->prog_data.nr_params) {
constant_nr = 0;
}
assert(this->params_remap[constant_nr] != -1);
inst->src[i].reg = this->params_remap[constant_nr];
inst->src[i].reg_offset = 0;