diff options
| author | Brian Paul <brianp@vmware.com> | 2010-04-15 12:48:12 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-04-15 12:48:12 -0600 |
| commit | 0f16b07a041148ce9d050ec58f42a4302a9cb2cf (patch) | |
| tree | 5661a0431da6ed5e2a68dae1bae3fe83e47e208a /src/gallium/drivers/svga/svga_swtnl.h | |
| parent | 563a7e3cc552fdcfcaf9ac0d4b1683c3ba2ae732 (diff) | |
| parent | eee220d65d3d37030f33971b02823c614e3eb618 (diff) | |
| download | mesa-0f16b07a041148ce9d050ec58f42a4302a9cb2cf.tar.gz | |
Merge branch 'master' into lp-surface-tilinglp-surface-tiling
This brings in the gallium-resources branch changes. Things seem to be
working but there's probabaly bugs to be found.
Conflicts:
src/gallium/drivers/llvmpipe/lp_rast.c
src/gallium/drivers/llvmpipe/lp_scene.c
src/gallium/drivers/llvmpipe/lp_texture.c
src/gallium/drivers/llvmpipe/lp_texture.h
Diffstat (limited to 'src/gallium/drivers/svga/svga_swtnl.h')
| -rw-r--r-- | src/gallium/drivers/svga/svga_swtnl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/svga/svga_swtnl.h b/src/gallium/drivers/svga/svga_swtnl.h index 4882f26b170..096ed410b5b 100644 --- a/src/gallium/drivers/svga/svga_swtnl.h +++ b/src/gallium/drivers/svga/svga_swtnl.h @@ -40,7 +40,7 @@ void svga_destroy_swtnl( struct svga_context *svga ); enum pipe_error svga_swtnl_draw_range_elements(struct svga_context *svga, - struct pipe_buffer *indexBuffer, + struct pipe_resource *indexBuffer, unsigned indexSize, unsigned min_index, unsigned max_index, |