diff options
author | Kenneth Graunke <kenneth@whitecape.org> | 2014-05-27 18:16:01 -0700 |
---|---|---|
committer | Ian Romanick <ian.d.romanick@intel.com> | 2014-05-29 15:47:29 -0700 |
commit | 5347fc529537a52d2cebee64f7ea0f2b10dd17ab (patch) | |
tree | 352c770b968f2b31155804070eb0901ca897e0fe /src | |
parent | e8e48889e6fd10c64ce8319c2c765e66c446294b (diff) |
i965: Fix repeated usage of rectangle texture coordinate scaling.
Previously, we set up new entries in the params[] array on every access
of a rectangle texture. Unfortunately, we only reserve space for
(2 * MaxTextureImageUnits) extra entries, so programs which accessed
rectangle textures more times than that would write off the end of the
array and likely crash.
We don't really have a decent mapping between the index returned by
_mesa_add_state_reference and our index into the params array, so we
have to manually search for it.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78691
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Cc: mesa-stable@lists.freedesktop.org
(cherry picked from commit bb9623a1a8b1884817422752c8dced9f084d4547)
Diffstat (limited to 'src')
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp index bece45f25c4..02511b6f6fe 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp @@ -1483,15 +1483,28 @@ fs_visitor::rescale_texcoord(ir_texture *ir, fs_reg coordinate, return coordinate; } - scale_x = fs_reg(UNIFORM, uniforms); - scale_y = fs_reg(UNIFORM, uniforms + 1); - GLuint index = _mesa_add_state_reference(params, (gl_state_index *)tokens); - stage_prog_data->param[uniforms++] = - &prog->Parameters->ParameterValues[index][0].f; - stage_prog_data->param[uniforms++] = - &prog->Parameters->ParameterValues[index][1].f; + /* Try to find existing copies of the texrect scale uniforms. */ + for (unsigned i = 0; i < uniforms; i++) { + if (stage_prog_data->param[i] == + &prog->Parameters->ParameterValues[index][0].f) { + scale_x = fs_reg(UNIFORM, i); + scale_y = fs_reg(UNIFORM, i + 1); + break; + } + } + + /* If we didn't already set them up, do so now. */ + if (scale_x.file == BAD_FILE) { + scale_x = fs_reg(UNIFORM, uniforms); + scale_y = fs_reg(UNIFORM, uniforms + 1); + + stage_prog_data->param[uniforms++] = + &prog->Parameters->ParameterValues[index][0].f; + stage_prog_data->param[uniforms++] = + &prog->Parameters->ParameterValues[index][1].f; + } } /* The 965 requires the EU to do the normalization of GL rectangle |