* Jerome Glisse
* Corbin Simpson <MostAwesomeDude@gmail.com>
*/
-#include <byteswap.h>
-
-#include <pipe/p_screen.h>
-#include <util/u_format.h>
-#include <util/u_math.h>
-#include <util/u_inlines.h>
-#include <util/u_memory.h>
-#include "util/u_upload_mgr.h"
-
-#include "r600.h"
#include "r600_pipe.h"
+#include "util/u_upload_mgr.h"
+#include "util/u_memory.h"
static void r600_buffer_destroy(struct pipe_screen *screen,
struct pipe_resource *buf)
{
- struct r600_screen *rscreen = (struct r600_screen*)screen;
- struct r600_resource_buffer *rbuffer = r600_buffer(buf);
+ struct r600_resource *rbuffer = r600_resource(buf);
- if (rbuffer->r.bo) {
- r600_bo_reference(&rbuffer->r.bo, NULL);
- }
- rbuffer->r.bo = NULL;
- util_slab_free(&rscreen->pool_buffers, rbuffer);
+ pb_reference(&rbuffer->buf, NULL);
+ FREE(rbuffer);
}
static struct pipe_transfer *r600_get_transfer(struct pipe_context *ctx,
unsigned usage,
const struct pipe_box *box)
{
- struct r600_pipe_context *rctx = (struct r600_pipe_context*)ctx;
- struct pipe_transfer *transfer = util_slab_alloc(&rctx->pool_transfers);
+ struct r600_context *rctx = (struct r600_context*)ctx;
+ struct r600_transfer *transfer = util_slab_alloc(&rctx->pool_transfers);
- transfer->resource = resource;
- transfer->level = level;
- transfer->usage = usage;
- transfer->box = *box;
- transfer->stride = 0;
- transfer->layer_stride = 0;
- transfer->data = NULL;
+ assert(box->x + box->width <= resource->width0);
+
+ transfer->transfer.resource = resource;
+ transfer->transfer.level = level;
+ transfer->transfer.usage = usage;
+ transfer->transfer.box = *box;
+ transfer->transfer.stride = 0;
+ transfer->transfer.layer_stride = 0;
+ transfer->transfer.data = NULL;
+ transfer->staging = NULL;
+ transfer->offset = 0;
/* Note strides are zero, this is ok for buffers, but not for
* textures 2d & higher at least.
*/
- return transfer;
+ return &transfer->transfer;
+}
+
+static void r600_set_constants_dirty_if_bound(struct r600_context *rctx,
+ struct r600_resource *rbuffer)
+{
+ unsigned shader;
+
+ for (shader = 0; shader < PIPE_SHADER_TYPES; shader++) {
+ struct r600_constbuf_state *state = &rctx->constbuf_state[shader];
+ bool found = false;
+ uint32_t mask = state->enabled_mask;
+
+ while (mask) {
+ unsigned i = u_bit_scan(&mask);
+ if (state->cb[i].buffer == &rbuffer->b.b) {
+ found = true;
+ state->dirty_mask |= 1 << i;
+ }
+ }
+ if (found) {
+ r600_constant_buffers_dirty(rctx, state);
+ }
+ }
}
static void *r600_buffer_transfer_map(struct pipe_context *pipe,
struct pipe_transfer *transfer)
{
- struct r600_resource_buffer *rbuffer = r600_buffer(transfer->resource);
- struct r600_pipe_context *rctx = (struct r600_pipe_context*)pipe;
+ struct r600_resource *rbuffer = r600_resource(transfer->resource);
+ struct r600_context *rctx = (struct r600_context*)pipe;
uint8_t *data;
- if (rbuffer->r.b.user_ptr)
- return (uint8_t*)rbuffer->r.b.user_ptr + transfer->box.x;
+ if (transfer->usage & PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE &&
+ !(transfer->usage & PIPE_TRANSFER_UNSYNCHRONIZED)) {
+ assert(transfer->usage & PIPE_TRANSFER_WRITE);
+
+ /* Check if mapping this buffer would cause waiting for the GPU. */
+ if (rctx->ws->cs_is_buffer_referenced(rctx->cs, rbuffer->cs_buf, RADEON_USAGE_READWRITE) ||
+ rctx->ws->buffer_is_busy(rbuffer->buf, RADEON_USAGE_READWRITE)) {
+ unsigned i, mask;
+
+ /* Discard the buffer. */
+ pb_reference(&rbuffer->buf, NULL);
+
+ /* Create a new one in the same pipe_resource. */
+ /* XXX We probably want a different alignment for buffers and textures. */
+ r600_init_resource(rctx->screen, rbuffer, rbuffer->b.b.width0, 4096,
+ rbuffer->b.b.bind, rbuffer->b.b.usage);
+
+ /* We changed the buffer, now we need to bind it where the old one was bound. */
+ /* Vertex buffers. */
+ mask = rctx->vertex_buffer_state.enabled_mask;
+ while (mask) {
+ i = u_bit_scan(&mask);
+ if (rctx->vertex_buffer_state.vb[i].buffer == &rbuffer->b.b) {
+ rctx->vertex_buffer_state.dirty_mask |= 1 << i;
+ r600_vertex_buffers_dirty(rctx);
+ }
+ }
+ /* Streamout buffers. */
+ for (i = 0; i < rctx->num_so_targets; i++) {
+ if (rctx->so_targets[i]->b.buffer == &rbuffer->b.b) {
+ r600_context_streamout_end(rctx);
+ rctx->streamout_start = TRUE;
+ rctx->streamout_append_bitmask = ~0;
+ }
+ }
+ /* Constant buffers. */
+ r600_set_constants_dirty_if_bound(rctx, rbuffer);
+ }
+ }
+#if 0 /* this is broken (see Bug 53130) */
+ else if ((transfer->usage & PIPE_TRANSFER_DISCARD_RANGE) &&
+ !(transfer->usage & PIPE_TRANSFER_UNSYNCHRONIZED) &&
+ rctx->screen->has_streamout &&
+ /* The buffer range must be aligned to 4. */
+ transfer->box.x % 4 == 0 && transfer->box.width % 4 == 0) {
+ assert(transfer->usage & PIPE_TRANSFER_WRITE);
+
+ /* Check if mapping this buffer would cause waiting for the GPU. */
+ if (rctx->ws->cs_is_buffer_referenced(rctx->cs, rbuffer->cs_buf, RADEON_USAGE_READWRITE) ||
+ rctx->ws->buffer_is_busy(rbuffer->buf, RADEON_USAGE_READWRITE)) {
+ /* Do a wait-free write-only transfer using a temporary buffer. */
+ struct r600_transfer *rtransfer = (struct r600_transfer*)transfer;
+
+ rtransfer->staging = (struct r600_resource*)
+ pipe_buffer_create(pipe->screen, PIPE_BIND_VERTEX_BUFFER,
+ PIPE_USAGE_STAGING, transfer->box.width);
+ return rctx->ws->buffer_map(rtransfer->staging->cs_buf, rctx->cs, PIPE_TRANSFER_WRITE);
+ }
+ }
+#endif
- data = r600_bo_map(rctx->screen->radeon, rbuffer->r.bo, rctx->ctx.cs, transfer->usage);
+ data = rctx->ws->buffer_map(rbuffer->cs_buf, rctx->cs, transfer->usage);
if (!data)
return NULL;
static void r600_buffer_transfer_unmap(struct pipe_context *pipe,
struct pipe_transfer *transfer)
{
- struct r600_resource_buffer *rbuffer = r600_buffer(transfer->resource);
- struct r600_pipe_context *rctx = (struct r600_pipe_context*)pipe;
+ struct r600_transfer *rtransfer = (struct r600_transfer*)transfer;
- if (rbuffer->r.b.user_ptr)
- return;
+ if (rtransfer->staging) {
+ struct pipe_box box;
+ u_box_1d(0, transfer->box.width, &box);
- if (rbuffer->r.bo)
- r600_bo_unmap(rctx->screen->radeon, rbuffer->r.bo);
-}
-
-static void r600_buffer_transfer_flush_region(struct pipe_context *pipe,
- struct pipe_transfer *transfer,
- const struct pipe_box *box)
-{
+ /* Copy the staging buffer into the original one. */
+ r600_copy_buffer(pipe, transfer->resource, transfer->box.x,
+ &rtransfer->staging->b.b, &box);
+ pipe_resource_reference((struct pipe_resource**)&rtransfer->staging, NULL);
+ }
}
static void r600_transfer_destroy(struct pipe_context *ctx,
struct pipe_transfer *transfer)
{
- struct r600_pipe_context *rctx = (struct r600_pipe_context*)ctx;
+ struct r600_context *rctx = (struct r600_context*)ctx;
util_slab_free(&rctx->pool_transfers, transfer);
}
-static void r600_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 r600_pipe_context *rctx = (struct r600_pipe_context*)pipe;
- struct radeon *radeon = rctx->screen->radeon;
- struct r600_resource_buffer *rbuffer = r600_buffer(resource);
- uint8_t *map = NULL;
-
- assert(rbuffer->r.b.user_ptr == NULL);
-
- map = r600_bo_map(radeon, rbuffer->r.bo, rctx->ctx.cs,
- PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD | usage);
-
- memcpy(map + box->x, data, box->width);
-
- if (rbuffer->r.bo)
- r600_bo_unmap(radeon, rbuffer->r.bo);
-}
-
static const struct u_resource_vtbl r600_buffer_vtbl =
{
u_default_resource_get_handle, /* get_handle */
r600_get_transfer, /* get_transfer */
r600_transfer_destroy, /* transfer_destroy */
r600_buffer_transfer_map, /* transfer_map */
- r600_buffer_transfer_flush_region, /* transfer_flush_region */
+ NULL, /* transfer_flush_region */
r600_buffer_transfer_unmap, /* transfer_unmap */
- r600_buffer_transfer_inline_write /* transfer_inline_write */
+ NULL /* transfer_inline_write */
};
-struct pipe_resource *r600_buffer_create(struct pipe_screen *screen,
- const struct pipe_resource *templ)
-{
- struct r600_screen *rscreen = (struct r600_screen*)screen;
- struct r600_resource_buffer *rbuffer;
- struct r600_bo *bo;
- /* XXX We probably want a different alignment for buffers and textures. */
- unsigned alignment = 4096;
-
- rbuffer = util_slab_alloc(&rscreen->pool_buffers);
-
- rbuffer->magic = R600_BUFFER_MAGIC;
- rbuffer->r.b.b.b = *templ;
- pipe_reference_init(&rbuffer->r.b.b.b.reference, 1);
- rbuffer->r.b.b.b.screen = screen;
- rbuffer->r.b.b.vtbl = &r600_buffer_vtbl;
- rbuffer->r.b.user_ptr = NULL;
- rbuffer->r.size = rbuffer->r.b.b.b.width0;
- rbuffer->r.bo_size = rbuffer->r.size;
-
- bo = r600_bo(rscreen->radeon,
- rbuffer->r.b.b.b.width0,
- alignment, rbuffer->r.b.b.b.bind,
- rbuffer->r.b.b.b.usage);
-
- if (bo == NULL) {
- FREE(rbuffer);
- return NULL;
- }
- rbuffer->r.bo = bo;
- return &rbuffer->r.b.b.b;
-}
-
-struct pipe_resource *r600_user_buffer_create(struct pipe_screen *screen,
- void *ptr, unsigned bytes,
- unsigned bind)
-{
- struct r600_screen *rscreen = (struct r600_screen*)screen;
- struct r600_resource_buffer *rbuffer;
-
- rbuffer = util_slab_alloc(&rscreen->pool_buffers);
-
- rbuffer->magic = R600_BUFFER_MAGIC;
- pipe_reference_init(&rbuffer->r.b.b.b.reference, 1);
- rbuffer->r.b.b.vtbl = &r600_buffer_vtbl;
- rbuffer->r.b.b.b.screen = screen;
- rbuffer->r.b.b.b.target = PIPE_BUFFER;
- rbuffer->r.b.b.b.format = PIPE_FORMAT_R8_UNORM;
- rbuffer->r.b.b.b.usage = PIPE_USAGE_IMMUTABLE;
- rbuffer->r.b.b.b.bind = bind;
- rbuffer->r.b.b.b.width0 = bytes;
- rbuffer->r.b.b.b.height0 = 1;
- rbuffer->r.b.b.b.depth0 = 1;
- rbuffer->r.b.b.b.array_size = 1;
- rbuffer->r.b.b.b.flags = 0;
- rbuffer->r.b.user_ptr = ptr;
- rbuffer->r.bo = NULL;
- rbuffer->r.bo_size = 0;
- return &rbuffer->r.b.b.b;
-}
-
-struct pipe_resource *r600_buffer_from_handle(struct pipe_screen *screen,
- struct winsys_handle *whandle)
+bool r600_init_resource(struct r600_screen *rscreen,
+ struct r600_resource *res,
+ unsigned size, unsigned alignment,
+ unsigned bind, unsigned usage)
{
- struct radeon *rw = ((struct r600_screen*)screen)->radeon;
- struct r600_resource *rbuffer;
- struct r600_bo *bo = NULL;
+ uint32_t initial_domain, domains;
- bo = r600_bo_handle(rw, whandle, NULL, NULL);
- if (bo == NULL) {
- return NULL;
+ /* Staging resources particpate in transfers and blits only
+ * and are used for uploads and downloads from regular
+ * resources. We generate them internally for some transfers.
+ */
+ if (usage == PIPE_USAGE_STAGING) {
+ domains = RADEON_DOMAIN_GTT;
+ initial_domain = RADEON_DOMAIN_GTT;
+ } else {
+ domains = RADEON_DOMAIN_GTT | RADEON_DOMAIN_VRAM;
+
+ switch(usage) {
+ case PIPE_USAGE_DYNAMIC:
+ case PIPE_USAGE_STREAM:
+ case PIPE_USAGE_STAGING:
+ initial_domain = RADEON_DOMAIN_GTT;
+ break;
+ case PIPE_USAGE_DEFAULT:
+ case PIPE_USAGE_STATIC:
+ case PIPE_USAGE_IMMUTABLE:
+ default:
+ initial_domain = RADEON_DOMAIN_VRAM;
+ break;
+ }
}
- rbuffer = CALLOC_STRUCT(r600_resource);
- if (rbuffer == NULL) {
- r600_bo_reference(&bo, NULL);
- return NULL;
+ res->buf = rscreen->ws->buffer_create(rscreen->ws, size, alignment, bind, initial_domain);
+ if (!res->buf) {
+ return false;
}
- pipe_reference_init(&rbuffer->b.b.b.reference, 1);
- rbuffer->b.b.b.target = PIPE_BUFFER;
- rbuffer->b.b.b.screen = screen;
- rbuffer->b.b.vtbl = &r600_buffer_vtbl;
- rbuffer->bo = bo;
- return &rbuffer->b.b.b;
-}
-
-void r600_upload_index_buffer(struct r600_pipe_context *rctx, struct r600_drawl *draw)
-{
- struct r600_resource_buffer *rbuffer = r600_buffer(draw->index_buffer);
- boolean flushed;
-
- u_upload_data(rctx->vbuf_mgr->uploader, 0,
- draw->info.count * draw->index_size,
- rbuffer->r.b.user_ptr,
- &draw->index_buffer_offset,
- &draw->index_buffer, &flushed);
+ res->cs_buf = rscreen->ws->buffer_get_cs_handle(res->buf);
+ res->domains = domains;
+ return true;
}
-void r600_upload_const_buffer(struct r600_pipe_context *rctx, struct r600_resource_buffer **rbuffer,
- uint32_t *const_offset)
+struct pipe_resource *r600_buffer_create(struct pipe_screen *screen,
+ const struct pipe_resource *templ,
+ unsigned alignment)
{
- if ((*rbuffer)->r.b.user_ptr) {
- uint8_t *ptr = (*rbuffer)->r.b.user_ptr;
- unsigned size = (*rbuffer)->r.b.b.b.width0;
- boolean flushed;
-
- *rbuffer = NULL;
-
- if (R600_BIG_ENDIAN) {
- uint32_t *tmpPtr;
- unsigned i;
-
- if (!(tmpPtr = malloc(size))) {
- R600_ERR("Failed to allocate BE swap buffer.\n");
- return;
- }
+ struct r600_screen *rscreen = (struct r600_screen*)screen;
+ struct r600_resource *rbuffer;
- for (i = 0; i < size / 4; ++i) {
- tmpPtr[i] = bswap_32(((uint32_t *)ptr)[i]);
- }
+ rbuffer = MALLOC_STRUCT(r600_resource);
- u_upload_data(rctx->vbuf_mgr->uploader, 0, size, tmpPtr, const_offset,
- (struct pipe_resource**)rbuffer, &flushed);
+ rbuffer->b.b = *templ;
+ pipe_reference_init(&rbuffer->b.b.reference, 1);
+ rbuffer->b.b.screen = screen;
+ rbuffer->b.vtbl = &r600_buffer_vtbl;
- free(tmpPtr);
- } else {
- u_upload_data(rctx->vbuf_mgr->uploader, 0, size, ptr, const_offset,
- (struct pipe_resource**)rbuffer, &flushed);
- }
- } else {
- *const_offset = 0;
+ if (!r600_init_resource(rscreen, rbuffer, templ->width0, alignment, templ->bind, templ->usage)) {
+ FREE(rbuffer);
+ return NULL;
}
+ return &rbuffer->b.b;
}
projects / mesa.git / blobdiff