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

softpipe: Fix segfault with fbo-cubemap.

Browse source 
The cube sampler generates two-dimensional texture coordinates and
hence passes NULL for the array for the third one.  The actual 2D
sampler, lower in the pipe, knew not to used that array since it
didn't need it.  But the samplers have become single-texel and the
coordinate array dereference has been moved up one step, to a level
where the code does not know only two coordinates are used.  Hence the
segfault.

The simplest fix by far is to add a third dummy coordinate array in
the call to the next pipe step, which will be dereferenced to an
harmless 0 which then will be happily ignored by the sampler.

Fixes https://bugs.freedesktop.org/show_bug.cgi?id=52250

Signed-off-by: Olivier Galibert <galibert@pobox.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Olivier Galibert 2012-07-19 18:55:14 +02:00 • committed by Brian Paul
parent d7522ed130
commit fbe3fa74e5
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gallium/drivers/softpipe/sp_tex_sample.c
View file

@ -2090,6 +2090,11 @@ sample_cube(struct tgsi_sampler *tgsi_sampler,
unsigned j;
float ssss[4], tttt[4];
/* Not actually used, but the intermediate steps that do the
* dereferencing don't know it.
*/
static const float pppp[4] = { 0, 0, 0, 0 };
/*
major axis
direction target sc tc ma
@ -2157,7 +2162,7 @@ sample_cube(struct tgsi_sampler *tgsi_sampler,
* is not active, this will point somewhere deeper into the
* pipeline, eg. to mip_filter or even img_filter.
*/
samp->compare(tgsi_sampler, ssss, tttt, NULL, c0, control, rgba);
samp->compare(tgsi_sampler, ssss, tttt, pppp, c0, control, rgba);
}