aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/llvmpipe/lp_state_fs.c
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2012-08-04 08:46:42 -0600
committerBrian Paul <[email protected]>2012-08-06 08:33:17 -0600
commitb3538d356316b282d6408f710f2df5f06bf315f5 (patch)
treed75e24c0b2570799fb997ffa15aae5aa0c59215a /src/gallium/drivers/llvmpipe/lp_state_fs.c
parent1f34e1a6cbac4b96d07a3d6d01bc443d5282add4 (diff)
llvmpipe: combine vertex/fragment sampler state into an array
This will allow code consolidation in the next patch. Reviewed-by: José Fonseca <[email protected]>
Diffstat (limited to 'src/gallium/drivers/llvmpipe/lp_state_fs.c')
-rw-r--r--src/gallium/drivers/llvmpipe/lp_state_fs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c
index 374544fcf70..da20dedde3e 100644
--- a/src/gallium/drivers/llvmpipe/lp_state_fs.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c
@@ -1645,8 +1645,8 @@ make_variant_key(struct llvmpipe_context *lp,
for(i = 0; i < key->nr_samplers; ++i) {
if(shader->info.base.file_mask[TGSI_FILE_SAMPLER] & (1 << i)) {
lp_sampler_static_state(&key->sampler[i],
- lp->fragment_sampler_views[i],
- lp->sampler[i]);
+ lp->sampler_views[PIPE_SHADER_FRAGMENT][i],
+ lp->samplers[PIPE_SHADER_FRAGMENT][i]);
}
}
}