diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-01-16 15:35:02 +0000 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2014-01-25 16:45:36 -0800 |
| commit | a3f259e4049a4e2e12d53bc3cb35e3a684afe0d4 (patch) | |
| tree | 44219e9c5bc78870006cf4183c0ba9901eb30af8 | |
| parent | 705da421307cd96f7905923827461ada88abf932 (diff) | |
nv50: access only the available amount of textures
The textures array is defined as a number of PIPE_MAX_SAMPLERS per shader stage.
Currently nv50 driver handles only 3 shader stages, thus we wreck chaos when
accessing array-out-of-bounds.
Fixes a segfault in piglit/bin/arb_texture_buffer_object-data-sync -fbo -auto
Cc: 9.1 9.2 10.0 <mesa-stable@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
(cherry picked from commit d606ca37eb20f18d8ac4727c68831fcecb2f7de4)
| -rw-r--r-- | src/gallium/drivers/nouveau/nv50/nv50_context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_context.c b/src/gallium/drivers/nouveau/nv50/nv50_context.c index 11afc48eab6..eb345dc24bc 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_context.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_context.c @@ -165,7 +165,7 @@ nv50_invalidate_resource_storage(struct nouveau_context *ctx, } if (res->bind & PIPE_BIND_SAMPLER_VIEW) { - for (s = 0; s < 5; ++s) { + for (s = 0; s < 3; ++s) { for (i = 0; i < nv50->num_textures[s]; ++i) { if (nv50->textures[s][i] && nv50->textures[s][i]->texture == res) { |