diff options
| author | Thomas Hellstrom <[email protected]> | 2011-03-17 15:09:48 +0100 |
|---|---|---|
| committer | Thomas Hellstrom <[email protected]> | 2011-07-01 13:30:37 +0200 |
| commit | 0277df86dfdf1738396bc7885bec3054c86c834f (patch) | |
| tree | 4f709d1c0fb67fd8224fbdbf5eceef7c74921cad /src | |
| parent | cf4cd8592ab54b9c959ea3b5f21437e8dca6bbcf (diff) | |
gallium/svga: Make use of u_upload_flush().
This enables us to pack more data into single upload buffers.
Signed-off-by: Thomas Hellstrom <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/svga/svga_context.c | 8 | ||||
| -rw-r--r-- | src/gallium/drivers/svga/svga_draw.c | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/gallium/drivers/svga/svga_context.c b/src/gallium/drivers/svga/svga_context.c index dbbc249258d..cfb1b9d8d0d 100644 --- a/src/gallium/drivers/svga/svga_context.c +++ b/src/gallium/drivers/svga/svga_context.c @@ -207,6 +207,14 @@ void svga_context_flush( struct svga_context *svga, svga->curr.nr_fbs = 0; + /* Flush the upload managers to ensure recycling of upload buffers + * without throttling. This should really be conditioned on + * pipe_buffer_map_range not supporting PIPE_TRANSFER_UNSYNCHRONIZED. + */ + + u_upload_flush(svga->upload_vb); + u_upload_flush(svga->upload_ib); + /* Ensure that texture dma uploads are processed * before submitting commands. */ diff --git a/src/gallium/drivers/svga/svga_draw.c b/src/gallium/drivers/svga/svga_draw.c index d8af615ede1..28ba470d8c7 100644 --- a/src/gallium/drivers/svga/svga_draw.c +++ b/src/gallium/drivers/svga/svga_draw.c @@ -145,7 +145,7 @@ svga_hwtnl_flush( struct svga_hwtnl *hwtnl ) unsigned i; /* Unmap upload manager vertex buffers */ - u_upload_flush(svga->upload_vb); + u_upload_unmap(svga->upload_vb); for (i = 0; i < hwtnl->cmd.vdecl_count; i++) { handle = svga_buffer_handle(svga, hwtnl->cmd.vdecl_vb[i]); @@ -156,7 +156,7 @@ svga_hwtnl_flush( struct svga_hwtnl *hwtnl ) } /* Unmap upload manager index buffers */ - u_upload_flush(svga->upload_ib); + u_upload_unmap(svga->upload_ib); for (i = 0; i < hwtnl->cmd.prim_count; i++) { if (hwtnl->cmd.prim_ib[i]) { |