Mesa (master): i915g: fix unused variable and type conversion warnings

[Marek Olšák]

Module: Mesa
Branch: master
Commit: cf9081b37cbfaa4f1cdcb1b53dd44bb2a688bfb2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cf9081b37cbfaa4f1cdcb1b53dd44bb2a688bfb2

Author: Marek Olšák <maraeo at gmail.com>
Date:   Tue Oct  9 14:33:16 2012 +0200

i915g: fix unused variable and type conversion warnings

---

 src/gallium/drivers/i915/i915_state.c   |    1 -
 src/gallium/drivers/i915/i915_surface.c |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/i915/i915_state.c b/src/gallium/drivers/i915/i915_state.c
index a00e2fb..d96ac7a 100644
--- a/src/gallium/drivers/i915/i915_state.c
+++ b/src/gallium/drivers/i915/i915_state.c
@@ -931,7 +931,6 @@ static void i915_set_vertex_buffers(struct pipe_context *pipe,
 {
    struct i915_context *i915 = i915_context(pipe);
    struct draw_context *draw = i915->draw;
-   int i;
 
    util_copy_vertex_buffers(i915->vertex_buffers,
                             &i915->nr_vertex_buffers,
diff --git a/src/gallium/drivers/i915/i915_surface.c b/src/gallium/drivers/i915/i915_surface.c
index 6f5a654..331d6e2 100644
--- a/src/gallium/drivers/i915/i915_surface.c
+++ b/src/gallium/drivers/i915/i915_surface.c
@@ -62,7 +62,7 @@ i915_util_blitter_save_states(struct i915_context *i915)
 
    util_blitter_save_fragment_sampler_states(i915->blitter,
                                              i915->num_samplers,
-                                             i915->sampler);
+                                             (void**)i915->sampler);
    util_blitter_save_fragment_sampler_views(i915->blitter,
                                             i915->num_fragment_sampler_views,
                                             i915->fragment_sampler_views);