OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iris: Fix buffer -> buffer copy_region

Browse Source 
Size can be too large for a surf, blorp_buffer_copy chops things up
into segments we can actually handle

Fixes map_buffer_range_test and copy_buffer_coherency
This commit is contained in:
Kenneth Graunke
2018-11-20 22:51:26 -08:00
parent beb2d5e065
commit c5b22441f1
1 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/gallium/drivers/iris/iris_blit.c
View File

@@ -395,27 +395,42 @@ iris_resource_copy_region(struct pipe_context *ctx,
unsigned src_level, unsigned src_level,
const struct pipe_box *src_box) const struct pipe_box *src_box)
{ {
struct blorp_batch blorp_batch;
struct iris_context *ice = (void *) ctx; struct iris_context *ice = (void *) ctx;
struct blorp_surf src_surf, dst_surf;
iris_blorp_surf_for_resource(&src_surf, src, ISL_AUX_USAGE_NONE, false);
iris_blorp_surf_for_resource(&dst_surf, dst, ISL_AUX_USAGE_NONE, true);
// XXX: ???
unsigned dst_layer = dstz;
unsigned src_layer = src_box->z;
assert(src_box->depth == 1);
struct iris_batch *batch = &ice->batches[IRIS_BATCH_RENDER]; struct iris_batch *batch = &ice->batches[IRIS_BATCH_RENDER];
iris_batch_maybe_flush(batch, 1500); iris_batch_maybe_flush(batch, 1500);
struct blorp_batch blorp_batch;
blorp_batch_init(&ice->blorp, &blorp_batch, batch, 0); blorp_batch_init(&ice->blorp, &blorp_batch, batch, 0);
blorp_copy(&blorp_batch, &src_surf, src_level, src_layer,
&dst_surf, dst_level, dst_layer, if (dst->target == PIPE_BUFFER && src->target == PIPE_BUFFER) {
src_box->x, src_box->y, dstx, dsty, struct blorp_address src_addr = {
src_box->width, src_box->height); .buffer = iris_resource_bo(src), .offset = src_box->x,
};
struct blorp_address dst_addr = {
.buffer = iris_resource_bo(dst), .offset = dstx,
};
blorp_buffer_copy(&blorp_batch, src_addr, dst_addr, src_box->width);
} else {
// XXX: what about one surface being a buffer and not the other?
struct blorp_surf src_surf, dst_surf;
iris_blorp_surf_for_resource(&src_surf, src, ISL_AUX_USAGE_NONE, false);
iris_blorp_surf_for_resource(&dst_surf, dst, ISL_AUX_USAGE_NONE, true);
// XXX: ???
unsigned dst_layer = dstz;
unsigned src_layer = src_box->z;
assert(src_box->depth == 1);
blorp_copy(&blorp_batch, &src_surf, src_level, src_layer,
&dst_surf, dst_level, dst_layer,
src_box->x, src_box->y, dstx, dsty,
src_box->width, src_box->height);
}
blorp_batch_finish(&blorp_batch); blorp_batch_finish(&blorp_batch);
} }