Mesa (master): radeonsi: Keep around copies of original sampler states.

[Michel Dänzer]

Module: Mesa
Branch: master
Commit: 8969de7e986265168532fbfec7557fd9bf632012
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8969de7e986265168532fbfec7557fd9bf632012

Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Mon May 14 16:34:11 2012 +0200

radeonsi: Keep around copies of original sampler states.

Fixes crashes when restoring sampler states after blits.

---

 src/gallium/drivers/radeonsi/evergreen_state.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/evergreen_state.c b/src/gallium/drivers/radeonsi/evergreen_state.c
index 264618b..8043c0c 100644
--- a/src/gallium/drivers/radeonsi/evergreen_state.c
+++ b/src/gallium/drivers/radeonsi/evergreen_state.c
@@ -1349,6 +1349,8 @@ static void evergreen_bind_ps_sampler(struct pipe_context *ctx, unsigned count,
 
 	rctx->ws->buffer_unmap(bo->cs_buf);
 
+	memcpy(rctx->ps_samplers.samplers, states, sizeof(void*) * count);
+
 	rstate->nregs = 0;
 	va = r600_resource_va(ctx->screen, (void *)bo);
 	r600_pipe_state_add_reg(rstate, R_00B038_SPI_SHADER_USER_DATA_PS_2, va, bo, RADEON_USAGE_READ);