diff options
| author | Stéphane Marchesin <[email protected]> | 2011-12-15 12:59:58 -0800 |
|---|---|---|
| committer | Stéphane Marchesin <[email protected]> | 2011-12-19 18:28:26 -0800 |
| commit | a7534d8943d74e81299b2ee4edc462baac9d1331 (patch) | |
| tree | 8756c9f991ec904dc39c4c51bd9b3046f299f2ae | |
| parent | c661843ab6adc97b54debaccfb29b897b12ab76d (diff) | |
i915g: Make the pipe_sampler_state struct non const and get rid of useless memcpy.
| -rw-r--r-- | src/gallium/drivers/i915/i915_context.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/i915/i915_state.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/i915/i915_context.h b/src/gallium/drivers/i915/i915_context.h index bb1b3b1608a..fb511853e72 100644 --- a/src/gallium/drivers/i915/i915_context.h +++ b/src/gallium/drivers/i915/i915_context.h @@ -202,7 +202,7 @@ struct i915_rasterizer_state { }; struct i915_sampler_state { - const struct pipe_sampler_state templ; + struct pipe_sampler_state templ; unsigned state[3]; unsigned minlod; unsigned maxlod; diff --git a/src/gallium/drivers/i915/i915_state.c b/src/gallium/drivers/i915/i915_state.c index fc0c8685560..853468c6ffd 100644 --- a/src/gallium/drivers/i915/i915_state.c +++ b/src/gallium/drivers/i915/i915_state.c @@ -223,7 +223,7 @@ i915_create_sampler_state(struct pipe_context *pipe, unsigned minFilt, magFilt; unsigned mipFilt; - memcpy(&cso->templ, sampler, sizeof(struct pipe_sampler_state)); + cso->templ = *sampler; mipFilt = translate_mip_filter(sampler->min_mip_filter); minFilt = translate_img_filter( sampler->min_img_filter ); |