diff options
| author | Marek Olšák <[email protected]> | 2012-10-09 14:33:16 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-10-09 14:33:16 +0200 |
| commit | cf9081b37cbfaa4f1cdcb1b53dd44bb2a688bfb2 (patch) | |
| tree | a2edc8261f2c88e76ee5cb3a1d098d4dc9f49c60 | |
| parent | 4f310984a99e13877f17aa19c2820e56738ecfd6 (diff) | |
i915g: fix unused variable and type conversion warnings
| -rw-r--r-- | src/gallium/drivers/i915/i915_state.c | 1 | ||||
| -rw-r--r-- | 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 a00e2fb3af4..d96ac7ab938 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 6f5a654069f..331d6e230d0 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); |