diff options
author | Brian Paul <brianp@vmware.com> | 2011-02-02 20:30:54 -0700 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2011-02-02 20:30:56 -0700 |
commit | 843f206a342751084cbd55d9fb0fdf78fd310e99 (patch) | |
tree | 42b0cdca6322c3d6a54397a365da0f09c16bc64c /src/gallium/drivers/softpipe/sp_state_sampler.c | |
parent | c06fa98c86abbff730a098ffbe980347b3c7d0e6 (diff) |
softpipe: rename fragment sampler/view fields
To be consistant with vertex, geometry sampler fields.
Diffstat (limited to 'src/gallium/drivers/softpipe/sp_state_sampler.c')
-rw-r--r-- | src/gallium/drivers/softpipe/sp_state_sampler.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/softpipe/sp_state_sampler.c b/src/gallium/drivers/softpipe/sp_state_sampler.c index 3894356380..9bc69f6e0a 100644 --- a/src/gallium/drivers/softpipe/sp_state_sampler.c +++ b/src/gallium/drivers/softpipe/sp_state_sampler.c @@ -76,7 +76,7 @@ softpipe_bind_fragment_sampler_states(struct pipe_context *pipe, assert(num <= PIPE_MAX_SAMPLERS); /* Check for no-op */ - if (num == softpipe->num_samplers && + if (num == softpipe->num_fragment_samplers && !memcmp(softpipe->sampler, sampler, num * sizeof(void *))) return; @@ -87,7 +87,7 @@ softpipe_bind_fragment_sampler_states(struct pipe_context *pipe, for (i = num; i < PIPE_MAX_SAMPLERS; ++i) softpipe->sampler[i] = NULL; - softpipe->num_samplers = num; + softpipe->num_fragment_samplers = num; softpipe->dirty |= SP_NEW_SAMPLER; } @@ -191,7 +191,7 @@ softpipe_set_fragment_sampler_views(struct pipe_context *pipe, assert(num <= PIPE_MAX_SAMPLERS); /* Check for no-op */ - if (num == softpipe->num_sampler_views && + if (num == softpipe->num_fragment_sampler_views && !memcmp(softpipe->fragment_sampler_views, views, num * sizeof(struct pipe_sampler_view *))) return; @@ -205,7 +205,7 @@ softpipe_set_fragment_sampler_views(struct pipe_context *pipe, sp_tex_tile_cache_set_sampler_view(softpipe->fragment_tex_cache[i], view); } - softpipe->num_sampler_views = num; + softpipe->num_fragment_sampler_views = num; softpipe->dirty |= SP_NEW_TEXTURE; } |