From 23e4fe2a5310021dc522465cd9d0939117e2b641 Mon Sep 17 00:00:00 2001 From: Michel Dänzer Date: Mon, 14 May 2012 15:32:02 +0200 Subject: radeonsi: Separate states for samplers and sampler views. And reset nregs on updates. Prevents eventual assertion failure. --- src/gallium/drivers/radeonsi/radeonsi_pipe.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/gallium/drivers/radeonsi/radeonsi_pipe.h') diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.h b/src/gallium/drivers/radeonsi/radeonsi_pipe.h index bcb5ec64d5c..366dd0c51fd 100644 --- a/src/gallium/drivers/radeonsi/radeonsi_pipe.h +++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.h @@ -203,7 +203,8 @@ struct si_pipe_shader { #define NUM_TEX_UNITS 16 struct r600_textures_info { - struct r600_pipe_state rstate; + struct r600_pipe_state views_state; + struct r600_pipe_state samplers_state; struct si_pipe_sampler_view *views[NUM_TEX_UNITS]; struct si_pipe_sampler_state *samplers[NUM_TEX_UNITS]; unsigned n_views; -- cgit v1.2.3