i915g: Make the pipe_sampler_state struct non const and get rid of useless memcpy.

diff --git a/src/gallium/drivers/i915/i915_context.h b/src/gallium/drivers/i915/i915_context.h
index bb1b3b1608a55ca87459535652eca6f77b5ac3d8..fb511853e720837471fc240896fe452b6adfdaca 100644 (file)
--- 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 fc0c86855603b6301d20fc529d17ab2a51e004d2..853468c6ffd5101179cab7746e7c93fed8c6281b 100644 (file)
--- 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 );