summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Davy <[email protected]>2016-12-03 23:18:30 +0100
committerAxel Davy <[email protected]>2016-12-20 23:47:08 +0100
commitc873a2bd0c5a9fcb6e83f23e4494b5f53d71288b (patch)
tree3bcb47f257fb9d289c7c2c6a4736ce0cf291ae35
parentcadc7a5d9459b7a47d934cf0055a1a06d1f774d4 (diff)
st/nine: Implement nine_context_box_upload
This function will be used for surface and volume uploads Signed-off-by: Axel Davy <[email protected]>
-rw-r--r--src/gallium/state_trackers/nine/nine_state.c39
-rw-r--r--src/gallium/state_trackers/nine/nine_state.h11
2 files changed, 50 insertions, 0 deletions
diff --git a/src/gallium/state_trackers/nine/nine_state.c b/src/gallium/state_trackers/nine/nine_state.c
index a3a6e166538..8facbae18bf 100644
--- a/src/gallium/state_trackers/nine/nine_state.c
+++ b/src/gallium/state_trackers/nine/nine_state.c
@@ -2718,6 +2718,45 @@ CSMT_ITEM_NO_WAIT_WITH_COUNTER(nine_context_range_upload,
context->pipe->buffer_subdata(context->pipe, res, 0, offset, size, data);
}
+CSMT_ITEM_NO_WAIT_WITH_COUNTER(nine_context_box_upload,
+ ARG_BIND_RES(struct pipe_resource, res),
+ ARG_VAL(unsigned, level),
+ ARG_COPY_REF(struct pipe_box, dst_box),
+ ARG_VAL(enum pipe_format, src_format),
+ ARG_VAL(const void *, src),
+ ARG_VAL(unsigned, src_stride),
+ ARG_VAL(unsigned, src_layer_stride),
+ ARG_COPY_REF(struct pipe_box, src_box))
+{
+ struct nine_context *context = &device->context;
+ struct pipe_context *pipe = context->pipe;
+ struct pipe_transfer *transfer = NULL;
+ uint8_t *map;
+
+ map = pipe->transfer_map(pipe,
+ res,
+ level,
+ PIPE_TRANSFER_WRITE | PIPE_TRANSFER_DISCARD_RANGE,
+ dst_box, &transfer);
+ if (!map)
+ return;
+
+ /* Note: if formats are the sames, it will revert
+ * to normal memcpy */
+ (void) util_format_translate_3d(res->format,
+ map, transfer->stride,
+ transfer->layer_stride,
+ 0, 0, 0,
+ src_format,
+ src, src_stride,
+ src_layer_stride,
+ src_box->x, src_box->y, src_box->z,
+ dst_box->width, dst_box->height,
+ dst_box->depth);
+
+ pipe_transfer_unmap(pipe, transfer);
+}
+
struct pipe_query *
nine_context_create_query(struct NineDevice9 *device, unsigned query_type)
{
diff --git a/src/gallium/state_trackers/nine/nine_state.h b/src/gallium/state_trackers/nine/nine_state.h
index 0fa19a2fddc..96c00d40f5e 100644
--- a/src/gallium/state_trackers/nine/nine_state.h
+++ b/src/gallium/state_trackers/nine/nine_state.h
@@ -554,6 +554,17 @@ nine_context_range_upload(struct NineDevice9 *device,
unsigned size,
const void *data);
+void
+nine_context_box_upload(struct NineDevice9 *device,
+ unsigned *counter,
+ struct pipe_resource *res,
+ unsigned level,
+ const struct pipe_box *dst_box,
+ enum pipe_format src_format,
+ const void *src, unsigned src_stride,
+ unsigned src_layer_stride,
+ const struct pipe_box *src_box);
+
struct pipe_query *
nine_context_create_query(struct NineDevice9 *device, unsigned query_type);