aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/brw_fs.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_fs.cpp')
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs.cpp12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 9efdfc8e485..baaa25c1347 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -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;