parent
65d451d9fa
commit
3ac0683d63
|
@ -183,7 +183,6 @@ i915_user_buffer_create(struct pipe_screen *screen,
|
||||||
buf->b.b.height0 = 1;
|
buf->b.b.height0 = 1;
|
||||||
buf->b.b.depth0 = 1;
|
buf->b.b.depth0 = 1;
|
||||||
buf->b.b.array_size = 1;
|
buf->b.b.array_size = 1;
|
||||||
buf->b.b.user_ptr = ptr;
|
|
||||||
|
|
||||||
buf->data = ptr;
|
buf->data = ptr;
|
||||||
buf->free_on_destroy = FALSE;
|
buf->free_on_destroy = FALSE;
|
||||||
|
|
|
@ -770,7 +770,6 @@ llvmpipe_user_buffer_create(struct pipe_screen *screen,
|
||||||
buffer->base.height0 = 1;
|
buffer->base.height0 = 1;
|
||||||
buffer->base.depth0 = 1;
|
buffer->base.depth0 = 1;
|
||||||
buffer->base.array_size = 1;
|
buffer->base.array_size = 1;
|
||||||
buffer->base.user_ptr = ptr;
|
|
||||||
buffer->userBuffer = TRUE;
|
buffer->userBuffer = TRUE;
|
||||||
buffer->data = ptr;
|
buffer->data = ptr;
|
||||||
|
|
||||||
|
|
|
@ -156,7 +156,6 @@ static struct pipe_resource *noop_user_buffer_create(struct pipe_screen *screen,
|
||||||
templ.height0 = 1;
|
templ.height0 = 1;
|
||||||
templ.depth0 = 1;
|
templ.depth0 = 1;
|
||||||
templ.flags = 0;
|
templ.flags = 0;
|
||||||
templ.user_ptr = ptr;
|
|
||||||
return noop_resource_create(screen, &templ);
|
return noop_resource_create(screen, &templ);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -398,7 +398,6 @@ nouveau_user_buffer_create(struct pipe_screen *pscreen, void *ptr,
|
||||||
buffer->base.width0 = bytes;
|
buffer->base.width0 = bytes;
|
||||||
buffer->base.height0 = 1;
|
buffer->base.height0 = 1;
|
||||||
buffer->base.depth0 = 1;
|
buffer->base.depth0 = 1;
|
||||||
buffer->base.user_ptr = ptr;
|
|
||||||
|
|
||||||
buffer->data = ptr;
|
buffer->data = ptr;
|
||||||
buffer->status = NOUVEAU_BUFFER_STATUS_USER_MEMORY;
|
buffer->status = NOUVEAU_BUFFER_STATUS_USER_MEMORY;
|
||||||
|
|
|
@ -108,8 +108,6 @@ r300_buffer_transfer_map( struct pipe_context *pipe,
|
||||||
uint8_t *map;
|
uint8_t *map;
|
||||||
enum pipe_transfer_usage usage;
|
enum pipe_transfer_usage usage;
|
||||||
|
|
||||||
if (rbuf->b.b.user_ptr)
|
|
||||||
return rbuf->b.b.user_ptr + transfer->box.x;
|
|
||||||
if (rbuf->constant_buffer)
|
if (rbuf->constant_buffer)
|
||||||
return (uint8_t *) rbuf->constant_buffer + transfer->box.x;
|
return (uint8_t *) rbuf->constant_buffer + transfer->box.x;
|
||||||
|
|
||||||
|
@ -159,7 +157,6 @@ struct pipe_resource *r300_buffer_create(struct pipe_screen *screen,
|
||||||
rbuf->b.vtbl = &r300_buffer_vtbl;
|
rbuf->b.vtbl = &r300_buffer_vtbl;
|
||||||
pipe_reference_init(&rbuf->b.b.reference, 1);
|
pipe_reference_init(&rbuf->b.b.reference, 1);
|
||||||
rbuf->b.b.screen = screen;
|
rbuf->b.b.screen = screen;
|
||||||
rbuf->b.b.user_ptr = NULL;
|
|
||||||
rbuf->domain = RADEON_DOMAIN_GTT;
|
rbuf->domain = RADEON_DOMAIN_GTT;
|
||||||
rbuf->buf = NULL;
|
rbuf->buf = NULL;
|
||||||
rbuf->constant_buffer = NULL;
|
rbuf->constant_buffer = NULL;
|
||||||
|
@ -205,7 +202,6 @@ struct pipe_resource *r300_user_buffer_create(struct pipe_screen *screen,
|
||||||
rbuf->b.b.depth0 = 1;
|
rbuf->b.b.depth0 = 1;
|
||||||
rbuf->b.b.array_size = 1;
|
rbuf->b.b.array_size = 1;
|
||||||
rbuf->b.b.flags = 0;
|
rbuf->b.b.flags = 0;
|
||||||
rbuf->b.b.user_ptr = ptr;
|
|
||||||
rbuf->b.vtbl = &r300_buffer_vtbl;
|
rbuf->b.vtbl = &r300_buffer_vtbl;
|
||||||
rbuf->domain = RADEON_DOMAIN_GTT;
|
rbuf->domain = RADEON_DOMAIN_GTT;
|
||||||
rbuf->buf = NULL;
|
rbuf->buf = NULL;
|
||||||
|
|
|
@ -126,9 +126,6 @@ static void *r600_buffer_transfer_map(struct pipe_context *pipe,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rbuffer->b.b.user_ptr)
|
|
||||||
return rbuffer->b.b.user_ptr + transfer->box.x;
|
|
||||||
|
|
||||||
data = rctx->ws->buffer_map(rbuffer->cs_buf, rctx->cs, transfer->usage);
|
data = rctx->ws->buffer_map(rbuffer->cs_buf, rctx->cs, transfer->usage);
|
||||||
if (!data)
|
if (!data)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -216,7 +213,6 @@ struct pipe_resource *r600_buffer_create(struct pipe_screen *screen,
|
||||||
rbuffer->b.b = *templ;
|
rbuffer->b.b = *templ;
|
||||||
pipe_reference_init(&rbuffer->b.b.reference, 1);
|
pipe_reference_init(&rbuffer->b.b.reference, 1);
|
||||||
rbuffer->b.b.screen = screen;
|
rbuffer->b.b.screen = screen;
|
||||||
rbuffer->b.b.user_ptr = NULL;
|
|
||||||
rbuffer->b.vtbl = &r600_buffer_vtbl;
|
rbuffer->b.vtbl = &r600_buffer_vtbl;
|
||||||
|
|
||||||
if (!r600_init_resource(rscreen, rbuffer, templ->width0, alignment, templ->bind, templ->usage)) {
|
if (!r600_init_resource(rscreen, rbuffer, templ->width0, alignment, templ->bind, templ->usage)) {
|
||||||
|
@ -247,7 +243,6 @@ struct pipe_resource *r600_user_buffer_create(struct pipe_screen *screen,
|
||||||
rbuffer->b.b.depth0 = 1;
|
rbuffer->b.b.depth0 = 1;
|
||||||
rbuffer->b.b.array_size = 1;
|
rbuffer->b.b.array_size = 1;
|
||||||
rbuffer->b.b.flags = 0;
|
rbuffer->b.b.flags = 0;
|
||||||
rbuffer->b.b.user_ptr = ptr;
|
|
||||||
rbuffer->buf = NULL;
|
rbuffer->buf = NULL;
|
||||||
return &rbuffer->b.b;
|
return &rbuffer->b.b;
|
||||||
}
|
}
|
||||||
|
|
|
@ -76,9 +76,6 @@ static void *r600_buffer_transfer_map(struct pipe_context *pipe,
|
||||||
struct r600_context *rctx = (struct r600_context*)pipe;
|
struct r600_context *rctx = (struct r600_context*)pipe;
|
||||||
uint8_t *data;
|
uint8_t *data;
|
||||||
|
|
||||||
if (rbuffer->b.b.user_ptr)
|
|
||||||
return (uint8_t*)rbuffer->b.b.user_ptr + transfer->box.x;
|
|
||||||
|
|
||||||
data = rctx->ws->buffer_map(rbuffer->cs_buf, rctx->cs, transfer->usage);
|
data = rctx->ws->buffer_map(rbuffer->cs_buf, rctx->cs, transfer->usage);
|
||||||
if (!data)
|
if (!data)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -173,7 +170,6 @@ struct pipe_resource *r600_buffer_create(struct pipe_screen *screen,
|
||||||
pipe_reference_init(&rbuffer->b.b.reference, 1);
|
pipe_reference_init(&rbuffer->b.b.reference, 1);
|
||||||
rbuffer->b.b.screen = screen;
|
rbuffer->b.b.screen = screen;
|
||||||
rbuffer->b.vtbl = &r600_buffer_vtbl;
|
rbuffer->b.vtbl = &r600_buffer_vtbl;
|
||||||
rbuffer->b.b.user_ptr = NULL;
|
|
||||||
|
|
||||||
if (!r600_init_resource(rscreen, rbuffer, templ->width0, alignment, templ->bind, templ->usage)) {
|
if (!r600_init_resource(rscreen, rbuffer, templ->width0, alignment, templ->bind, templ->usage)) {
|
||||||
util_slab_free(&rscreen->pool_buffers, rbuffer);
|
util_slab_free(&rscreen->pool_buffers, rbuffer);
|
||||||
|
@ -203,7 +199,6 @@ struct pipe_resource *r600_user_buffer_create(struct pipe_screen *screen,
|
||||||
rbuffer->b.b.depth0 = 1;
|
rbuffer->b.b.depth0 = 1;
|
||||||
rbuffer->b.b.array_size = 1;
|
rbuffer->b.b.array_size = 1;
|
||||||
rbuffer->b.b.flags = 0;
|
rbuffer->b.b.flags = 0;
|
||||||
rbuffer->b.b.user_ptr = ptr;
|
|
||||||
rbuffer->buf = NULL;
|
rbuffer->buf = NULL;
|
||||||
return &rbuffer->b.b;
|
return &rbuffer->b.b;
|
||||||
}
|
}
|
||||||
|
|
|
@ -476,7 +476,6 @@ softpipe_user_buffer_create(struct pipe_screen *screen,
|
||||||
spr->base.height0 = 1;
|
spr->base.height0 = 1;
|
||||||
spr->base.depth0 = 1;
|
spr->base.depth0 = 1;
|
||||||
spr->base.array_size = 1;
|
spr->base.array_size = 1;
|
||||||
spr->base.user_ptr = ptr;
|
|
||||||
spr->userBuffer = TRUE;
|
spr->userBuffer = TRUE;
|
||||||
spr->data = ptr;
|
spr->data = ptr;
|
||||||
|
|
||||||
|
|
|
@ -394,7 +394,6 @@ svga_user_buffer_create(struct pipe_screen *screen,
|
||||||
sbuf->b.b.height0 = 1;
|
sbuf->b.b.height0 = 1;
|
||||||
sbuf->b.b.depth0 = 1;
|
sbuf->b.b.depth0 = 1;
|
||||||
sbuf->b.b.array_size = 1;
|
sbuf->b.b.array_size = 1;
|
||||||
sbuf->b.b.user_ptr = ptr;
|
|
||||||
|
|
||||||
sbuf->swbuf = ptr;
|
sbuf->swbuf = ptr;
|
||||||
sbuf->user = TRUE;
|
sbuf->user = TRUE;
|
||||||
|
|
|
@ -415,9 +415,6 @@ struct pipe_resource
|
||||||
|
|
||||||
unsigned bind; /**< bitmask of PIPE_BIND_x */
|
unsigned bind; /**< bitmask of PIPE_BIND_x */
|
||||||
unsigned flags; /**< bitmask of PIPE_RESOURCE_FLAG_x */
|
unsigned flags; /**< bitmask of PIPE_RESOURCE_FLAG_x */
|
||||||
|
|
||||||
/* XXX this is only temporary and will be removed once it's not needed */
|
|
||||||
uint8_t *user_ptr; /**< user buffer pointer */
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue