Module: Mesa Branch: master Commit: 9ef549d7cd9aa14ab7c404609f38e2e6195b4335 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9ef549d7cd9aa14ab7c404609f38e2e6195b4335
Author: Christoph Bumiller <e0425...@student.tuwien.ac.at> Date: Fri May 4 17:40:33 2012 +0200 nv50: fix typo causing NULL-deref in nv50_resource_resolve Introduced in b328949a37fee7b0f68ed3e068ffc4426c083042. --- src/gallium/drivers/nv50/nv50_surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c index b38e49f..15c88d5 100644 --- a/src/gallium/drivers/nv50/nv50_surface.c +++ b/src/gallium/drivers/nv50/nv50_surface.c @@ -711,7 +711,7 @@ nv50_blit_set_src(struct nv50_context *nv50, templ.swizzle_a = PIPE_SWIZZLE_ALPHA; nv50->textures[2][0] = nv50_create_sampler_view(pipe, res, &templ); - nv50->textures[2][0] = NULL; + nv50->textures[2][1] = NULL; nv50_blit_fixup_tic_entry(nv50->textures[2][0]); _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit