summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/radeonsi/radeonsi_pipe.h
diff options
context:
space:
mode:
authorMichel Dänzer <[email protected]>2012-05-14 15:32:02 +0200
committerMichel Dänzer <[email protected]>2012-05-14 17:56:02 +0200
commit23e4fe2a5310021dc522465cd9d0939117e2b641 (patch)
tree3514a66c2dad935bfbd2ad0d357eda1114e9810a /src/gallium/drivers/radeonsi/radeonsi_pipe.h
parent36abadd0dbc9ca5dd1ca9b2842ec5ab78e640ccb (diff)
radeonsi: Separate states for samplers and sampler views.
And reset nregs on updates. Prevents eventual assertion failure.
Diffstat (limited to 'src/gallium/drivers/radeonsi/radeonsi_pipe.h')
-rw-r--r--src/gallium/drivers/radeonsi/radeonsi_pipe.h3
1 files changed, 2 insertions, 1 deletions
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;