diff options
author | Brian Paul <brianp@vmware.com> | 2011-02-02 20:43:56 -0700 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2011-02-02 20:43:56 -0700 |
commit | 4629be05098a4cfececcfa98ad88282800ab3a6c (patch) | |
tree | a00a814650df1ea472c568389343687efd334856 /src/gallium/drivers/softpipe/sp_state_sampler.c | |
parent | 843f206a342751084cbd55d9fb0fdf78fd310e99 (diff) |
softpipe: rename sampler[] -> fragment_samplers[]
Diffstat (limited to 'src/gallium/drivers/softpipe/sp_state_sampler.c')
-rw-r--r-- | src/gallium/drivers/softpipe/sp_state_sampler.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/drivers/softpipe/sp_state_sampler.c b/src/gallium/drivers/softpipe/sp_state_sampler.c index 9bc69f6e0a..60331bc497 100644 --- a/src/gallium/drivers/softpipe/sp_state_sampler.c +++ b/src/gallium/drivers/softpipe/sp_state_sampler.c @@ -77,15 +77,15 @@ softpipe_bind_fragment_sampler_states(struct pipe_context *pipe, /* Check for no-op */ if (num == softpipe->num_fragment_samplers && - !memcmp(softpipe->sampler, sampler, num * sizeof(void *))) + !memcmp(softpipe->fragment_samplers, sampler, num * sizeof(void *))) return; draw_flush(softpipe->draw); for (i = 0; i < num; ++i) - softpipe->sampler[i] = sampler[i]; + softpipe->fragment_samplers[i] = sampler[i]; for (i = num; i < PIPE_MAX_SAMPLERS; ++i) - softpipe->sampler[i] = NULL; + softpipe->fragment_samplers[i] = NULL; softpipe->num_fragment_samplers = num; @@ -374,10 +374,10 @@ softpipe_reset_sampler_variants(struct softpipe_context *softpipe) } for (i = 0; i <= softpipe->fs->info.file_max[TGSI_FILE_SAMPLER]; i++) { - if (softpipe->sampler[i]) { + if (softpipe->fragment_samplers[i]) { softpipe->tgsi.frag_samplers_list[i] = get_sampler_variant( i, - sp_sampler(softpipe->sampler[i]), + sp_sampler(softpipe->fragment_samplers[i]), softpipe->fragment_sampler_views[i], TGSI_PROCESSOR_FRAGMENT ); |