diff options
author | Stéphane Marchesin <[email protected]> | 2013-10-07 20:49:35 -0700 |
---|---|---|
committer | Stéphane Marchesin <[email protected]> | 2013-10-07 20:53:55 -0700 |
commit | 20bf508a42b0fdd5b094842b1bbeb412ce3f8505 (patch) | |
tree | 8ca4e5119dc955ceae51dfd1443b65608682f341 /src/gallium/drivers/i915/i915_state.c | |
parent | 8c6594074e798e8d5e13dc49720f7b8b4b381bbb (diff) |
i915g: Rename sampler to fragment_sampler
Otherwise it is fairly confusing.
Diffstat (limited to 'src/gallium/drivers/i915/i915_state.c')
-rw-r--r-- | src/gallium/drivers/i915/i915_state.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/i915/i915_state.c b/src/gallium/drivers/i915/i915_state.c index ae4ad04826b..a858a2589b8 100644 --- a/src/gallium/drivers/i915/i915_state.c +++ b/src/gallium/drivers/i915/i915_state.c @@ -337,17 +337,17 @@ static void i915_bind_fragment_sampler_states(struct pipe_context *pipe, /* Check for no-op */ if (num == i915->num_samplers && - !memcmp(i915->sampler + start, samplers, + !memcmp(i915->fragment_sampler + start, samplers, num * sizeof(void *))) return; for (i = 0; i < num; ++i) - i915->sampler[i + start] = samplers[i]; + i915->fragment_sampler[i + start] = samplers[i]; /* find highest non-null samplers[] entry */ { unsigned j = MAX2(i915->num_samplers, start + num); - while (j > 0 && i915->sampler[j - 1] == NULL) + while (j > 0 && i915->fragment_sampler[j - 1] == NULL) j--; i915->num_samplers = j; } |