diff options
| author | Jakob Bornecrantz <jakob@tungstengraphics.com> | 2008-05-30 13:46:18 +0200 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@tungstengraphics.com> | 2008-05-30 13:46:18 +0200 |
| commit | 3869c3c87a40d9f41414082ad8dd3d747e6b34d8 (patch) | |
| tree | 04d493660504d59b7e2d3c8b2a5178b3865b84ec /src/gallium/auxiliary/draw/draw_pipe_vbuf.c | |
| parent | 2ade5268dca67a73d3f5f8cc41ea86d1e48de9f0 (diff) | |
| parent | 012c0dd6321e858af22389f98201c8dcb8f8780c (diff) | |
Merge branch 'gallium-tex-surfaces' into gallium-0.1
Conflicts:
src/gallium/drivers/i915simple/i915_context.h
Diffstat (limited to 'src/gallium/auxiliary/draw/draw_pipe_vbuf.c')
| -rw-r--r-- | src/gallium/auxiliary/draw/draw_pipe_vbuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/draw/draw_pipe_vbuf.c b/src/gallium/auxiliary/draw/draw_pipe_vbuf.c index 67b9a9503d..d514e28b77 100644 --- a/src/gallium/auxiliary/draw/draw_pipe_vbuf.c +++ b/src/gallium/auxiliary/draw/draw_pipe_vbuf.c @@ -145,7 +145,7 @@ emit_vertex( struct vbuf_stage *vbuf, vertex->vertex_id = vbuf->nr_vertices++; } - return vertex->vertex_id; + return (ushort)vertex->vertex_id; } |