aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/nv40/nv40_draw.c
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2010-01-05 14:13:40 +0000
committerKeith Whitwell <[email protected]>2010-01-05 14:13:40 +0000
commitc727fa6dbf5a9fca5fc94de06c309f54402449d1 (patch)
treed6e721f1dff0ccaf3666756c80a80e7c6d3dec32 /src/gallium/drivers/nv40/nv40_draw.c
parentc91ceeec320daebe7d9d78ed2d80a2265bcfa8c2 (diff)
parente3be32ccf900f22c1f75c9f2d8842fe9630da7d9 (diff)
Merge commit 'origin/gallium-draw-retval'
Conflicts: src/gallium/drivers/identity/id_context.c
Diffstat (limited to 'src/gallium/drivers/nv40/nv40_draw.c')
-rw-r--r--src/gallium/drivers/nv40/nv40_draw.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gallium/drivers/nv40/nv40_draw.c b/src/gallium/drivers/nv40/nv40_draw.c
index 3875bc35457..e5b9f4a5c8d 100644
--- a/src/gallium/drivers/nv40/nv40_draw.c
+++ b/src/gallium/drivers/nv40/nv40_draw.c
@@ -226,7 +226,7 @@ nv40_draw_render_stage(struct nv40_context *nv40)
return &render->stage;
}
-boolean
+void
nv40_draw_elements_swtnl(struct pipe_context *pipe,
struct pipe_buffer *idxbuf, unsigned idxbuf_size,
unsigned mode, unsigned start, unsigned count)
@@ -237,7 +237,7 @@ nv40_draw_elements_swtnl(struct pipe_context *pipe,
void *map;
if (!nv40_state_validate_swtnl(nv40))
- return FALSE;
+ return;
nv40->state.dirty &= ~(1ULL << NV40_STATE_VTXBUF);
nv40_state_emit(nv40);
@@ -278,8 +278,6 @@ nv40_draw_elements_swtnl(struct pipe_context *pipe,
draw_flush(nv40->draw);
pipe->flush(pipe, 0, NULL);
-
- return TRUE;
}
static INLINE void