fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 17:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: Fix repeated usage of rectangle texture coordinate scaling.

Browse source 
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
This commit is contained in:
Kenneth Graunke 2014-05-27 18:16:01 -07:00
parent 9ec7cb8aa0
commit bb9623a1a8
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/mesa/drivers/dri/i965/brw_fs_visitor.cpp
View file

@ -1486,15 +1486,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