diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-31 09:31:38 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-31 09:31:38 +0100 |
| commit | 5b22d4d5511efbd4fb0658c370edadd39829e39b (patch) | |
| tree | 96a36b429ff2a0819653279a5e63a1bed79d4434 /mesalib/src/gallium/auxiliary/util/u_blitter.h | |
| parent | 7bc456b7052b9591a58bfb6b509abb09d5464990 (diff) | |
| parent | 67c290de36ddc1caae94c0892157ac16b90e4f99 (diff) | |
| download | vcxsrv-5b22d4d5511efbd4fb0658c370edadd39829e39b.tar.gz vcxsrv-5b22d4d5511efbd4fb0658c370edadd39829e39b.tar.bz2 vcxsrv-5b22d4d5511efbd4fb0658c370edadd39829e39b.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa git update 31 oct 2012
Diffstat (limited to 'mesalib/src/gallium/auxiliary/util/u_blitter.h')
| -rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_blitter.h | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_blitter.h b/mesalib/src/gallium/auxiliary/util/u_blitter.h index c49faaad7..b96e68e93 100644 --- a/mesalib/src/gallium/auxiliary/util/u_blitter.h +++ b/mesalib/src/gallium/auxiliary/util/u_blitter.h @@ -104,8 +104,8 @@ struct blitter_context unsigned saved_num_sampler_views; struct pipe_sampler_view *saved_sampler_views[PIPE_MAX_SAMPLERS]; - unsigned saved_num_vertex_buffers; - struct pipe_vertex_buffer saved_vertex_buffers[PIPE_MAX_ATTRIBS]; + unsigned vb_slot; + struct pipe_vertex_buffer saved_vertex_buffer; unsigned saved_num_so_targets; struct pipe_stream_output_target *saved_so_targets[PIPE_MAX_SO_BUFFERS]; @@ -466,17 +466,13 @@ util_blitter_save_fragment_sampler_views(struct blitter_context *blitter, } static INLINE void -util_blitter_save_vertex_buffers(struct blitter_context *blitter, - unsigned num_vertex_buffers, - struct pipe_vertex_buffer *vertex_buffers) +util_blitter_save_vertex_buffer_slot(struct blitter_context *blitter, + struct pipe_vertex_buffer *vertex_buffers) { - assert(num_vertex_buffers <= Elements(blitter->saved_vertex_buffers)); - - blitter->saved_num_vertex_buffers = 0; - util_copy_vertex_buffers(blitter->saved_vertex_buffers, - (unsigned*)&blitter->saved_num_vertex_buffers, - vertex_buffers, - num_vertex_buffers); + pipe_resource_reference(&blitter->saved_vertex_buffer.buffer, + vertex_buffers[blitter->vb_slot].buffer); + memcpy(&blitter->saved_vertex_buffer, &vertex_buffers[blitter->vb_slot], + sizeof(struct pipe_vertex_buffer)); } static INLINE void |