Mesa (master): radeonsi: Handle NULL sampler states.

[Michel Dänzer]

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

Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Sep  7 17:26:15 2012 +0200

radeonsi: Handle NULL sampler states.

Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

---

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

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 67880f2..5240036 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -2310,7 +2310,7 @@ static void si_bind_ps_sampler(struct pipe_context *ctx, unsigned count, void **
 	si_pm4_sh_data_begin(pm4);
 	for (i = 0; i < count; i++) {
 		for (j = 0; j < Elements(rstates[i]->val); ++j) {
-			si_pm4_sh_data_add(pm4, rstates[i]->val[j]);
+			si_pm4_sh_data_add(pm4, rstates[i] ? rstates[i]->val[j] : 0);
 		}
 	}
 	si_pm4_sh_data_end(pm4, R_00B038_SPI_SHADER_USER_DATA_PS_2);