i915g: fix unused variable and type conversion warnings

diff --git a/src/gallium/drivers/i915/i915_state.c b/src/gallium/drivers/i915/i915_state.c
index a00e2fb3af4aab021c958a7a7936d5394f770a1f..d96ac7ab938266381a825da940d5367b96d219b9 100644 (file)
--- 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 6f5a654069f8d7b9f170f355cad266a1ec75d871..331d6e230d0747d540cbc7d2adba3b0325f5830d 100644 (file)
--- 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);