summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/i915simple
diff options
context:
space:
mode:
authorJakob Bornecrantz <jakob@aurora.(none)>2008-06-02 12:55:35 +0200
committerJakob Bornecrantz <jakob@aurora.(none)>2008-06-02 13:00:32 +0200
commitc1949e2bd3acc45c23cc434eef2b0d6aae9092ca (patch)
tree5881f863604cf0331e7af97f40dc74f2a1efcc24 /src/gallium/drivers/i915simple
parentf4364cd1a6f9e825ea183c1fa6d1050b7e113695 (diff)
i915: Fixed some warnings
Diffstat (limited to 'src/gallium/drivers/i915simple')
-rw-r--r--src/gallium/drivers/i915simple/i915_prim_vbuf.c4
-rw-r--r--src/gallium/drivers/i915simple/i915_state_emit.c1
2 files changed, 2 insertions, 3 deletions
diff --git a/src/gallium/drivers/i915simple/i915_prim_vbuf.c b/src/gallium/drivers/i915simple/i915_prim_vbuf.c
index f9297e29fcf..adfb16fbc5f 100644
--- a/src/gallium/drivers/i915simple/i915_prim_vbuf.c
+++ b/src/gallium/drivers/i915simple/i915_prim_vbuf.c
@@ -253,7 +253,6 @@ draw_arrays_fallback( struct vbuf_render *render,
{
struct i915_vbuf_render *i915_render = i915_vbuf_render(render);
struct i915_context *i915 = i915_render->i915;
- struct pipe_winsys *winsys = i915->pipe.winsys;
unsigned nr_indices;
if (i915->dirty)
@@ -372,7 +371,6 @@ i915_vbuf_render_draw( struct vbuf_render *render,
{
struct i915_vbuf_render *i915_render = i915_vbuf_render(render);
struct i915_context *i915 = i915_render->i915;
- struct pipe_winsys *winsys = i915->pipe.winsys;
unsigned save_nr_indices;
save_nr_indices = nr_indices;
@@ -424,7 +422,6 @@ i915_vbuf_render_release_vertices( struct vbuf_render *render,
{
struct i915_vbuf_render *i915_render = i915_vbuf_render(render);
struct i915_context *i915 = i915_render->i915;
- struct pipe_winsys *winsys = i915->pipe.winsys;
size_t size = (size_t)vertex_size * (size_t)vertices_used;
assert(i915->vbo);
@@ -502,6 +499,7 @@ struct draw_stage *i915_draw_vbuf_stage( struct i915_context *i915 )
render->destroy(render);
return NULL;
}
+ /** TODO JB: this shouldn't be here */
draw_set_render(i915->draw, render);
return stage;
diff --git a/src/gallium/drivers/i915simple/i915_state_emit.c b/src/gallium/drivers/i915simple/i915_state_emit.c
index 8bcc26ad356..de0c1a787ab 100644
--- a/src/gallium/drivers/i915simple/i915_state_emit.c
+++ b/src/gallium/drivers/i915simple/i915_state_emit.c
@@ -377,6 +377,7 @@ i915_emit_hardware_state(struct i915_context *i915 )
{
uint w, h;
boolean k = framebuffer_size(&i915->framebuffer, &w, &h);
+ (void)k;
assert(k);
OUT_BATCH(_3DSTATE_DRAW_RECT_CMD);