#include "util/u_math.h"
#include "r300_screen_buffer.h"
-#include "r300_winsys.h"
-
-unsigned r300_buffer_is_referenced(struct pipe_context *context,
- struct pipe_resource *buf,
- enum r300_reference_domain domain)
-{
- struct r300_context *r300 = r300_context(context);
- struct r300_buffer *rbuf = r300_buffer(buf);
-
- if (r300_buffer_is_user_buffer(buf))
- return PIPE_UNREFERENCED;
-
- if (r300->rws->cs_is_buffer_referenced(r300->cs, rbuf->cs_buf, domain))
- return PIPE_REFERENCED_FOR_READ | PIPE_REFERENCED_FOR_WRITE;
-
- return PIPE_UNREFERENCED;
-}
-
-static unsigned r300_buffer_is_referenced_by_cs(struct pipe_context *context,
- struct pipe_resource *buf,
- unsigned level, int layer)
-{
- return r300_buffer_is_referenced(context, buf, R300_REF_CS);
-}
void r300_upload_index_buffer(struct r300_context *r300,
struct pipe_resource **index_buffer,
unsigned index_size, unsigned *start,
- unsigned count)
+ unsigned count, const uint8_t *ptr)
{
unsigned index_offset;
- boolean flushed;
- uint8_t *ptr = r300_buffer(*index_buffer)->user_buffer;
*index_buffer = NULL;
- u_upload_data(r300->upload_ib,
- 0, count * index_size,
+ u_upload_data(r300->uploader,
+ 0, count * index_size, 4,
ptr + (*start * index_size),
&index_offset,
- index_buffer, &flushed);
+ index_buffer);
*start = index_offset / index_size;
}
-void r300_upload_user_buffers(struct r300_context *r300)
-{
- int i, nr = r300->velems->count;
- boolean flushed;
-
- for (i = 0; i < nr; i++) {
- struct pipe_vertex_buffer *vb =
- &r300->vertex_buffer[r300->velems->velem[i].vertex_buffer_index];
-
- if (r300_buffer_is_user_buffer(vb->buffer)) {
- u_upload_data(r300->upload_vb,
- 0, vb->buffer->width0,
- r300_buffer(vb->buffer)->user_buffer,
- &vb->buffer_offset, &vb->buffer, &flushed);
-
- r300->validate_buffers = TRUE;
- r300->vertex_arrays_dirty = TRUE;
- }
- }
-}
-
static void r300_buffer_destroy(struct pipe_screen *screen,
struct pipe_resource *buf)
{
- struct r300_screen *r300screen = r300_screen(screen);
- struct r300_buffer *rbuf = r300_buffer(buf);
- struct r300_winsys_screen *rws = r300screen->rws;
+ struct r300_resource *rbuf = r300_resource(buf);
- if (rbuf->constant_buffer)
- FREE(rbuf->constant_buffer);
+ align_free(rbuf->malloced_buffer);
if (rbuf->buf)
- rws->buffer_reference(rws, &rbuf->buf, NULL);
-
- util_slab_free(&r300screen->pool_buffers, rbuf);
-}
-
-static struct pipe_transfer*
-r300_buffer_get_transfer(struct pipe_context *context,
- struct pipe_resource *resource,
- unsigned level,
- unsigned usage,
- const struct pipe_box *box)
-{
- struct r300_context *r300 = r300_context(context);
- struct pipe_transfer *transfer =
- util_slab_alloc(&r300->pool_transfers);
-
- transfer->resource = resource;
- transfer->level = level;
- transfer->usage = usage;
- transfer->box = *box;
- transfer->stride = 0;
- transfer->layer_stride = 0;
- transfer->data = NULL;
-
- /* Note strides are zero, this is ok for buffers, but not for
- * textures 2d & higher at least.
- */
- return transfer;
-}
+ pb_reference(&rbuf->buf, NULL);
-static void r300_buffer_transfer_destroy(struct pipe_context *pipe,
- struct pipe_transfer *transfer)
-{
- struct r300_context *r300 = r300_context(pipe);
- util_slab_free(&r300->pool_transfers, transfer);
+ FREE(rbuf);
}
static void *
-r300_buffer_transfer_map( struct pipe_context *pipe,
- struct pipe_transfer *transfer )
+r300_buffer_transfer_map( struct pipe_context *context,
+ struct pipe_resource *resource,
+ unsigned level,
+ unsigned usage,
+ const struct pipe_box *box,
+ struct pipe_transfer **ptransfer )
{
- struct r300_context *r300 = r300_context(pipe);
- struct r300_screen *r300screen = r300_screen(pipe->screen);
- struct r300_winsys_screen *rws = r300screen->rws;
- struct r300_buffer *rbuf = r300_buffer(transfer->resource);
+ struct r300_context *r300 = r300_context(context);
+ struct radeon_winsys *rws = r300->screen->rws;
+ struct r300_resource *rbuf = r300_resource(resource);
+ struct pipe_transfer *transfer;
uint8_t *map;
- boolean flush = FALSE;
- unsigned i;
- if (rbuf->user_buffer)
- return (uint8_t *) rbuf->user_buffer + transfer->box.x;
- if (rbuf->constant_buffer)
- return (uint8_t *) rbuf->constant_buffer + transfer->box.x;
-
- /* check if the mapping is to a range we already flushed */
- if (transfer->usage & PIPE_TRANSFER_DISCARD) {
- for (i = 0; i < rbuf->num_ranges; i++) {
- if ((transfer->box.x >= rbuf->ranges[i].start) &&
- (transfer->box.x < rbuf->ranges[i].end))
- flush = TRUE;
+ transfer = slab_alloc(&r300->pool_transfers);
+ transfer->resource = resource;
+ transfer->level = level;
+ transfer->usage = usage;
+ transfer->box = *box;
+ transfer->stride = 0;
+ transfer->layer_stride = 0;
+
+ if (rbuf->malloced_buffer) {
+ *ptransfer = transfer;
+ return rbuf->malloced_buffer + box->x;
+ }
- if (flush) {
- /* unreference this hw buffer and allocate a new one */
- rws->buffer_reference(rws, &rbuf->buf, NULL);
+ if (usage & PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE &&
+ !(usage & PIPE_TRANSFER_UNSYNCHRONIZED)) {
+ assert(usage & PIPE_TRANSFER_WRITE);
+
+ /* Check if mapping this buffer would cause waiting for the GPU. */
+ if (r300->rws->cs_is_buffer_referenced(r300->cs, rbuf->buf, RADEON_USAGE_READWRITE) ||
+ !r300->rws->buffer_wait(rbuf->buf, 0, RADEON_USAGE_READWRITE)) {
+ unsigned i;
+ struct pb_buffer *new_buf;
+
+ /* Create a new one in the same pipe_resource. */
+ new_buf = r300->rws->buffer_create(r300->rws, rbuf->b.b.width0,
+ R300_BUFFER_ALIGNMENT,
+ rbuf->domain,
+ RADEON_FLAG_NO_INTERPROCESS_SHARING);
+ if (new_buf) {
+ /* Discard the old buffer. */
+ pb_reference(&rbuf->buf, NULL);
+ rbuf->buf = new_buf;
+
+ /* We changed the buffer, now we need to bind it where the old one was bound. */
+ for (i = 0; i < r300->nr_vertex_buffers; i++) {
+ if (r300->vertex_buffer[i].buffer.resource == &rbuf->b.b) {
+ r300->vertex_arrays_dirty = TRUE;
+ break;
+ }
+ }
+ }
+ }
+ }
- rbuf->num_ranges = 0;
- rbuf->buf =
- r300screen->rws->buffer_create(r300screen->rws,
- rbuf->b.b.width0, 16,
- rbuf->b.b.bind,
- rbuf->b.b.usage,
- rbuf->domain);
- rbuf->cs_buf =
- r300screen->rws->buffer_get_cs_handle(r300screen->rws,
- rbuf->buf);
- break;
- }
- }
+ /* Buffers are never used for write, therefore mapping for read can be
+ * unsynchronized. */
+ if (!(usage & PIPE_TRANSFER_WRITE)) {
+ usage |= PIPE_TRANSFER_UNSYNCHRONIZED;
}
- map = rws->buffer_map(rws, rbuf->buf, r300->cs, transfer->usage);
+ map = rws->buffer_map(rbuf->buf, r300->cs, usage);
- if (map == NULL)
+ if (!map) {
+ slab_free(&r300->pool_transfers, transfer);
return NULL;
-
- /* map_buffer() returned a pointer to the beginning of the buffer,
- * but transfers are expected to return a pointer to just the
- * region specified in the box.
- */
- return map + transfer->box.x;
-}
-
-static void r300_buffer_transfer_flush_region( struct pipe_context *pipe,
- struct pipe_transfer *transfer,
- const struct pipe_box *box)
-{
- struct r300_buffer *rbuf = r300_buffer(transfer->resource);
- unsigned i;
- unsigned offset = transfer->box.x + box->x;
- unsigned length = box->width;
-
- assert(box->x + box->width <= transfer->box.width);
-
- if (rbuf->user_buffer)
- return;
- if (rbuf->constant_buffer)
- return;
-
- /* mark the range as used */
- for(i = 0; i < rbuf->num_ranges; ++i) {
- if(offset <= rbuf->ranges[i].end && rbuf->ranges[i].start <= (offset+box->width)) {
- rbuf->ranges[i].start = MIN2(rbuf->ranges[i].start, offset);
- rbuf->ranges[i].end = MAX2(rbuf->ranges[i].end, (offset+length));
- return;
- }
}
- rbuf->ranges[rbuf->num_ranges].start = offset;
- rbuf->ranges[rbuf->num_ranges].end = offset+length;
- rbuf->num_ranges++;
+ *ptransfer = transfer;
+ return map + box->x;
}
static void r300_buffer_transfer_unmap( struct pipe_context *pipe,
- struct pipe_transfer *transfer )
-{
- struct r300_screen *r300screen = r300_screen(pipe->screen);
- struct r300_winsys_screen *rws = r300screen->rws;
- struct r300_buffer *rbuf = r300_buffer(transfer->resource);
-
- if (rbuf->buf) {
- rws->buffer_unmap(rws, rbuf->buf);
- }
-}
-
-static void r300_buffer_transfer_inline_write(struct pipe_context *pipe,
- struct pipe_resource *resource,
- unsigned level,
- unsigned usage,
- const struct pipe_box *box,
- const void *data,
- unsigned stride,
- unsigned layer_stride)
+ struct pipe_transfer *transfer )
{
struct r300_context *r300 = r300_context(pipe);
- struct r300_winsys_screen *rws = r300->screen->rws;
- struct r300_buffer *rbuf = r300_buffer(resource);
- uint8_t *map = NULL;
-
- if (rbuf->constant_buffer) {
- memcpy(rbuf->constant_buffer + box->x, data, box->width);
- return;
- }
- assert(rbuf->user_buffer == NULL);
-
- map = rws->buffer_map(rws, rbuf->buf, r300->cs,
- PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD | usage);
-
- memcpy(map + box->x, data, box->width);
- rws->buffer_unmap(rws, rbuf->buf);
+ slab_free(&r300->pool_transfers, transfer);
}
-struct u_resource_vtbl r300_buffer_vtbl =
+static const struct u_resource_vtbl r300_buffer_vtbl =
{
- u_default_resource_get_handle, /* get_handle */
+ NULL, /* get_handle */
r300_buffer_destroy, /* resource_destroy */
- r300_buffer_is_referenced_by_cs, /* is_buffer_referenced */
- r300_buffer_get_transfer, /* get_transfer */
- r300_buffer_transfer_destroy, /* transfer_destroy */
r300_buffer_transfer_map, /* transfer_map */
- r300_buffer_transfer_flush_region, /* transfer_flush_region */
+ NULL, /* transfer_flush_region */
r300_buffer_transfer_unmap, /* transfer_unmap */
- r300_buffer_transfer_inline_write /* transfer_inline_write */
};
struct pipe_resource *r300_buffer_create(struct pipe_screen *screen,
const struct pipe_resource *templ)
{
struct r300_screen *r300screen = r300_screen(screen);
- struct r300_buffer *rbuf;
- unsigned alignment = 16;
+ struct r300_resource *rbuf;
- rbuf = util_slab_alloc(&r300screen->pool_buffers);
-
- rbuf->magic = R300_BUFFER_MAGIC;
+ rbuf = MALLOC_STRUCT(r300_resource);
rbuf->b.b = *templ;
rbuf->b.vtbl = &r300_buffer_vtbl;
pipe_reference_init(&rbuf->b.b.reference, 1);
rbuf->b.b.screen = screen;
- rbuf->domain = R300_DOMAIN_GTT;
- rbuf->num_ranges = 0;
+ rbuf->domain = RADEON_DOMAIN_GTT;
rbuf->buf = NULL;
- rbuf->constant_buffer = NULL;
- rbuf->user_buffer = NULL;
+ rbuf->malloced_buffer = NULL;
- /* Alloc constant buffers in RAM. */
- if (templ->bind & PIPE_BIND_CONSTANT_BUFFER) {
- rbuf->constant_buffer = MALLOC(templ->width0);
+ /* Allocate constant buffers and SWTCL vertex and index buffers in RAM.
+ * Note that uploaded index buffers use the flag PIPE_BIND_CUSTOM, so that
+ * we can distinguish them from user-created buffers.
+ */
+ if (templ->bind & PIPE_BIND_CONSTANT_BUFFER ||
+ (!r300screen->caps.has_tcl && !(templ->bind & PIPE_BIND_CUSTOM))) {
+ rbuf->malloced_buffer = align_malloc(templ->width0, 64);
return &rbuf->b.b;
}
rbuf->buf =
- r300screen->rws->buffer_create(r300screen->rws,
- rbuf->b.b.width0, alignment,
- rbuf->b.b.bind, rbuf->b.b.usage,
- rbuf->domain);
- rbuf->cs_buf =
- r300screen->rws->buffer_get_cs_handle(r300screen->rws, rbuf->buf);
-
+ r300screen->rws->buffer_create(r300screen->rws, rbuf->b.b.width0,
+ R300_BUFFER_ALIGNMENT,
+ rbuf->domain,
+ RADEON_FLAG_NO_INTERPROCESS_SHARING);
if (!rbuf->buf) {
- util_slab_free(&r300screen->pool_buffers, rbuf);
+ FREE(rbuf);
return NULL;
}
-
- return &rbuf->b.b;
-}
-
-struct pipe_resource *r300_user_buffer_create(struct pipe_screen *screen,
- void *ptr,
- unsigned bytes,
- unsigned bind)
-{
- struct r300_screen *r300screen = r300_screen(screen);
- struct r300_buffer *rbuf;
-
- rbuf = util_slab_alloc(&r300screen->pool_buffers);
-
- rbuf->magic = R300_BUFFER_MAGIC;
-
- pipe_reference_init(&rbuf->b.b.reference, 1);
- rbuf->b.vtbl = &r300_buffer_vtbl;
- rbuf->b.b.screen = screen;
- rbuf->b.b.target = PIPE_BUFFER;
- rbuf->b.b.format = PIPE_FORMAT_R8_UNORM;
- rbuf->b.b.usage = PIPE_USAGE_IMMUTABLE;
- rbuf->b.b.bind = bind;
- rbuf->b.b.width0 = bytes;
- rbuf->b.b.height0 = 1;
- rbuf->b.b.depth0 = 1;
- rbuf->b.b.array_size = 1;
- rbuf->b.b.flags = 0;
- rbuf->domain = R300_DOMAIN_GTT;
- rbuf->num_ranges = 0;
- rbuf->buf = NULL;
- rbuf->constant_buffer = NULL;
- rbuf->user_buffer = ptr;
return &rbuf->b.b;
}
projects / mesa.git / blobdiff