r600g: Fix include style

[mesa.git] / src / gallium / drivers / r600 / r600_buffer.c

diff --git a/src/gallium/drivers/r600/r600_buffer.c b/src/gallium/drivers/r600/r600_buffer.c
index 2363cd1ebc5db5d043b56212f40ace1142022dfe..73d17b0671e913b7a93051a4dabc6f0229615389 100644 (file)
--- a/src/gallium/drivers/r600/r600_buffer.c
+++ b/src/gallium/drivers/r600/r600_buffer.c
@@ -24,17 +24,14 @@
  *      Jerome Glisse
  *      Corbin Simpson <MostAwesomeDude@gmail.com>
  */
-#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 "state_tracker/drm_driver.h"
+#include <byteswap.h>
 
-#include <xf86drm.h>
-#include "radeon_drm.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"
@@ -46,20 +43,12 @@ static void r600_buffer_destroy(struct pipe_screen *screen,
        struct r600_resource_buffer *rbuffer = r600_buffer(buf);
 
        if (rbuffer->r.bo) {
-               r600_bo_reference((struct radeon*)screen->winsys, &rbuffer->r.bo, NULL);
+               r600_bo_reference(&rbuffer->r.bo, NULL);
        }
        rbuffer->r.bo = NULL;
        util_slab_free(&rscreen->pool_buffers, rbuffer);
 }
 
-static unsigned r600_buffer_is_referenced_by_cs(struct pipe_context *context,
-                                               struct pipe_resource *buf,
-                                               unsigned level, int layer)
-{
-       /* FIXME */
-       return PIPE_REFERENCED_FOR_READ | PIPE_REFERENCED_FOR_WRITE;
-}
-
 static struct pipe_transfer *r600_get_transfer(struct pipe_context *ctx,
                                               struct pipe_resource *resource,
                                               unsigned level,
@@ -87,19 +76,13 @@ static void *r600_buffer_transfer_map(struct pipe_context *pipe,
                                      struct pipe_transfer *transfer)
 {
        struct r600_resource_buffer *rbuffer = r600_buffer(transfer->resource);
-       int write = 0;
+       struct r600_pipe_context *rctx = (struct r600_pipe_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_DONTBLOCK) {
-               /* FIXME */
-       }
-       if (transfer->usage & PIPE_TRANSFER_WRITE) {
-               write = 1;
-       }
-       data = r600_bo_map((struct radeon*)pipe->winsys, rbuffer->r.bo, transfer->usage, pipe);
+       data = r600_bo_map(rctx->screen->radeon, rbuffer->r.bo, rctx->ctx.cs, transfer->usage);
        if (!data)
                return NULL;
 
@@ -110,12 +93,13 @@ 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;
 
        if (rbuffer->r.b.user_ptr)
                return;
 
        if (rbuffer->r.bo)
-               r600_bo_unmap((struct radeon*)pipe->winsys, rbuffer->r.bo);
+               r600_bo_unmap(rctx->screen->radeon, rbuffer->r.bo);
 }
 
 static void r600_buffer_transfer_flush_region(struct pipe_context *pipe,
@@ -140,27 +124,26 @@ static void r600_buffer_transfer_inline_write(struct pipe_context *pipe,
                                                unsigned stride,
                                                unsigned layer_stride)
 {
-       struct radeon *ws = (struct radeon*)pipe->winsys;
+       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(ws, rbuffer->r.bo,
-                         PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD | usage,
-                         pipe);
+       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(ws, 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_buffer_destroy,                    /* resource_destroy */
-       r600_buffer_is_referenced_by_cs,        /* is_buffer_referenced */
        r600_get_transfer,                      /* get_transfer */
        r600_transfer_destroy,                  /* transfer_destroy */
        r600_buffer_transfer_map,               /* transfer_map */
@@ -189,7 +172,7 @@ struct pipe_resource *r600_buffer_create(struct pipe_screen *screen,
        rbuffer->r.size = rbuffer->r.b.b.b.width0;
        rbuffer->r.bo_size = rbuffer->r.size;
 
-       bo = r600_bo((struct radeon*)screen->winsys,
+       bo = r600_bo(rscreen->radeon,
                     rbuffer->r.b.b.b.width0,
                     alignment, rbuffer->r.b.b.b.bind,
                     rbuffer->r.b.b.b.usage);
@@ -233,18 +216,18 @@ struct pipe_resource *r600_user_buffer_create(struct pipe_screen *screen,
 struct pipe_resource *r600_buffer_from_handle(struct pipe_screen *screen,
                                              struct winsys_handle *whandle)
 {
-       struct radeon *rw = (struct radeon*)screen->winsys;
+       struct radeon *rw = ((struct r600_screen*)screen)->radeon;
        struct r600_resource *rbuffer;
        struct r600_bo *bo = NULL;
 
-       bo = r600_bo_handle(rw, whandle->handle, NULL);
+       bo = r600_bo_handle(rw, whandle, NULL, NULL);
        if (bo == NULL) {
                return NULL;
        }
 
        rbuffer = CALLOC_STRUCT(r600_resource);
        if (rbuffer == NULL) {
-               r600_bo_reference(rw, &bo, NULL);
+               r600_bo_reference(&bo, NULL);
                return NULL;
        }
 
@@ -278,8 +261,27 @@ void r600_upload_const_buffer(struct r600_pipe_context *rctx, struct r600_resour
 
                *rbuffer = NULL;
 
-               u_upload_data(rctx->vbuf_mgr->uploader, 0, size, ptr, const_offset,
-                             (struct pipe_resource**)rbuffer, &flushed);
+               if (R600_BIG_ENDIAN) {
+                       uint32_t *tmpPtr;
+                       unsigned i;
+
+                       if (!(tmpPtr = malloc(size))) {
+                               R600_ERR("Failed to allocate BE swap buffer.\n");
+                               return;
+                       }
+
+                       for (i = 0; i < size / 4; ++i) {
+                               tmpPtr[i] = bswap_32(((uint32_t *)ptr)[i]);
+                       }
+
+                       u_upload_data(rctx->vbuf_mgr->uploader, 0, size, tmpPtr, const_offset,
+                                     (struct pipe_resource**)rbuffer, &flushed);
+
+                       free(tmpPtr);
+               } else {
+                       u_upload_data(rctx->vbuf_mgr->uploader, 0, size, ptr, const_offset,
+                                     (struct pipe_resource**)rbuffer, &flushed);
+               }
        } else {
                *const_offset = 0;
        }