if (r300->vbuf_mgr)
u_vbuf_destroy(r300->vbuf_mgr);
+ u_upload_destroy(r300->uploader);
+
/* XXX: This function assumes r300->query_list was initialized */
r300_release_referenced_objects(r300);
goto fail;
}
+ r300->uploader = u_upload_create(&r300->context, 256 * 1024, 16,
+ PIPE_BIND_INDEX_BUFFER);
+
r300->blitter = util_blitter_create(&r300->context);
if (r300->blitter == NULL)
goto fail;
struct pipe_index_buffer index_buffer;
struct pipe_vertex_buffer vertex_buffer[PIPE_MAX_ATTRIBS];
unsigned nr_vertex_buffers;
+ struct u_upload_mgr *uploader;
struct util_slab_mempool pool_transfers;
switch (*index_size) {
case 1:
- u_upload_alloc(r300->vbuf_mgr->uploader, 0, count * 2,
+ u_upload_alloc(r300->uploader, 0, count * 2,
&out_offset, &out_buffer, &ptr);
util_shorten_ubyte_elts_to_userptr(
case 2:
if (index_offset) {
- u_upload_alloc(r300->vbuf_mgr->uploader, 0, count * 2,
+ u_upload_alloc(r300->uploader, 0, count * 2,
&out_offset, &out_buffer, &ptr);
util_rebuild_ushort_elts_to_userptr(&r300->context, *index_buffer,
case 4:
if (index_offset) {
- u_upload_alloc(r300->vbuf_mgr->uploader, 0, count * 4,
+ u_upload_alloc(r300->uploader, 0, count * 4,
&out_offset, &out_buffer, &ptr);
util_rebuild_uint_elts_to_userptr(&r300->context, *index_buffer,