fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[g3dvl] move mapping/unmapping of buffers one layer up

Browse source
This commit is contained in:
Christian König 2010-12-05 22:30:38 +01:00
parent 5701873402
commit 6484898752
3 changed files with 49 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
src/gallium/auxiliary/vl/vl_idct.c
View file

@ -566,35 +566,6 @@ vl_idct_upload_matrix(struct pipe_context *pipe)
return matrix;
}
static void
xfer_buffers_map(struct vl_idct *idct)
{
struct pipe_box rect =
{
0, 0, 0,
idct->textures.individual.source->width0,
idct->textures.individual.source->height0,
1
};
idct->tex_transfer = idct->pipe->get_transfer
(
idct->pipe, idct->textures.individual.source,
u_subresource(0, 0),
PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD,
&rect
);
idct->texels = idct->pipe->transfer_map(idct->pipe, idct->tex_transfer);
}
static void
xfer_buffers_unmap(struct vl_idct *idct)
{
idct->pipe->transfer_unmap(idct->pipe, idct->tex_transfer);
idct->pipe->transfer_destroy(idct->pipe, idct->tex_transfer);
}
bool
vl_idct_init(struct vl_idct *idct, struct pipe_context *pipe, struct pipe_resource *dst, struct pipe_resource *matrix)
{
@ -626,7 +597,7 @@ vl_idct_init(struct vl_idct *idct, struct pipe_context *pipe, struct pipe_resour
init_state(idct);
xfer_buffers_map(idct);
vl_idct_map_buffers(idct);
return true;
}
@ -634,6 +605,8 @@ vl_idct_init(struct vl_idct *idct, struct pipe_context *pipe, struct pipe_resour
void
vl_idct_cleanup(struct vl_idct *idct)
{
vl_idct_unmap_buffers(idct);
vl_vb_cleanup(&idct->blocks);
cleanup_shaders(idct);
cleanup_buffers(idct);
@ -643,6 +616,30 @@ vl_idct_cleanup(struct vl_idct *idct)
pipe_resource_reference(&idct->destination, NULL);
}
void
vl_idct_map_buffers(struct vl_idct *idct)
{
assert(idct);
struct pipe_box rect =
{
0, 0, 0,
idct->textures.individual.source->width0,
idct->textures.individual.source->height0,
1
};
idct->tex_transfer = idct->pipe->get_transfer
(
idct->pipe, idct->textures.individual.source,
u_subresource(0, 0),
PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD,
&rect
);
idct->texels = idct->pipe->transfer_map(idct->pipe, idct->tex_transfer);
}
void
vl_idct_add_block(struct vl_idct *idct, unsigned x, unsigned y, short *block)
{
@ -665,6 +662,15 @@ vl_idct_add_block(struct vl_idct *idct, unsigned x, unsigned y, short *block)
vl_vb_add_block(&idct->blocks, (float*)&v);
}
void
vl_idct_unmap_buffers(struct vl_idct *idct)
{
assert(idct);
idct->pipe->transfer_unmap(idct->pipe, idct->tex_transfer);
idct->pipe->transfer_destroy(idct->pipe, idct->tex_transfer);
}
void
vl_idct_flush(struct vl_idct *idct)
{
@ -686,8 +692,6 @@ vl_idct_flush(struct vl_idct *idct)
pipe_buffer_unmap(idct->pipe, idct->vertex_bufs.individual.pos.buffer, vec_transfer);
xfer_buffers_unmap(idct);
if(num_verts > 0) {
idct->pipe->bind_rasterizer_state(idct->pipe, idct->rs_state);
@ -711,6 +715,4 @@ vl_idct_flush(struct vl_idct *idct)
idct->pipe->bind_fs_state(idct->pipe, idct->transpose_fs);
util_draw_arrays(idct->pipe, PIPE_PRIM_QUADS, 0, num_verts);
}
xfer_buffers_map(idct);
}

4
src/gallium/auxiliary/vl/vl_idct.h
View file

@ -97,8 +97,12 @@ bool vl_idct_init(struct vl_idct *idct, struct pipe_context *pipe, struct pipe_r
void vl_idct_cleanup(struct vl_idct *idct);
void vl_idct_map_buffers(struct vl_idct *idct);
void vl_idct_add_block(struct vl_idct *idct, unsigned x, unsigned y, short *block);
void vl_idct_unmap_buffers(struct vl_idct *idct);
void vl_idct_flush(struct vl_idct *idct);
#endif

9
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
View file

@ -950,6 +950,10 @@ flush(struct vl_mpeg12_mc_renderer *r)
assert(r);
assert(r->num_macroblocks == r->macroblocks_per_batch);
vl_idct_unmap_buffers(&r->idct_y);
vl_idct_unmap_buffers(&r->idct_cr);
vl_idct_unmap_buffers(&r->idct_cb);
vl_idct_flush(&r->idct_y);
vl_idct_flush(&r->idct_cr);
vl_idct_flush(&r->idct_cb);
@ -965,8 +969,13 @@ flush(struct vl_mpeg12_mc_renderer *r)
vb_start += flush_mbtype_handler(r, i, vb_start, num_verts[i]);
}
r->pipe->flush(r->pipe, PIPE_FLUSH_RENDER_CACHE, r->fence);
vl_idct_map_buffers(&r->idct_y);
vl_idct_map_buffers(&r->idct_cr);
vl_idct_map_buffers(&r->idct_cb);
r->num_macroblocks = 0;
}