fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-29 09:30:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

turnip: add tu_cs_add_bo

Browse source 
Refactor BO allocation code out of tu_cs_begin.  Add error checking.
This commit is contained in:
Chia-I Wu 2019-01-16 11:17:26 -08:00
parent ae9a72b48b
commit af4eb20891
2 changed files with 51 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/freedreno/vulkan/tu_cmd_buffer.c
View file

@ -399,9 +399,11 @@ tu_BeginCommandBuffer(VkCommandBuffer commandBuffer,
}
}
cmd_buffer->status = TU_CMD_BUFFER_STATUS_RECORDING;
result = tu_cs_begin(cmd_buffer->device, &cmd_buffer->cs, 4096);
if (result != VK_SUCCESS)
return result;
cmd_buffer->status = TU_CMD_BUFFER_STATUS_RECORDING;
/* Put some stuff in so we do not have empty command buffers. */
tu_cs_emit_pkt7(&cmd_buffer->cs, CP_NOP, 4);
@ -410,7 +412,7 @@ tu_BeginCommandBuffer(VkCommandBuffer commandBuffer,
tu_cs_emit(&cmd_buffer->cs, 0);
tu_cs_emit(&cmd_buffer->cs, 0);
return result;
return VK_SUCCESS;
}
void

78
src/freedreno/vulkan/tu_cs.c
View file

@ -53,6 +53,50 @@ tu_cs_finish(struct tu_device *dev, struct tu_cs *cs)
free(cs->bos);
}
/*
* Allocate and add a BO to a command stream. Following command packets will
* be emitted to the new BO.
*/
static VkResult
tu_cs_add_bo(struct tu_device *dev, struct tu_cs *cs, uint32_t byte_size)
{
/* grow cs->bos if needed */
if (cs->bo_count == cs->bo_capacity) {
uint32_t new_capacity = MAX2(4, 2 * cs->bo_capacity);
struct tu_bo **new_bos =
realloc(cs->bos, new_capacity * sizeof(struct tu_bo *));
if (!new_bos)
return VK_ERROR_OUT_OF_HOST_MEMORY;
cs->bo_capacity = new_capacity;
cs->bos = new_bos;
}
struct tu_bo *new_bo = malloc(sizeof(struct tu_bo));
if (!new_bo)
return VK_ERROR_OUT_OF_HOST_MEMORY;
VkResult result = tu_bo_init_new(dev, new_bo, byte_size);
if (result != VK_SUCCESS) {
free(new_bo);
return result;
}
result = tu_bo_map(dev, new_bo);
if (result != VK_SUCCESS) {
tu_bo_finish(dev, new_bo);
free(new_bo);
return result;
}
cs->bos[cs->bo_count++] = new_bo;
cs->start = cs->cur = (uint32_t *) new_bo->map;
cs->end = cs->start + new_bo->size / sizeof(uint32_t);
return VK_SUCCESS;
}
/**
* Begin (or continue) command packet emission. This will reserve space from
* the command stream for at least \a reserve_size uint32_t values.
@ -63,43 +107,13 @@ tu_cs_begin(struct tu_device *dev, struct tu_cs *cs, uint32_t reserve_size)
assert(reserve_size);
if (cs->end - cs->cur < reserve_size) {
if (cs->bo_count == cs->bo_capacity) {
uint32_t new_capacity = MAX2(4, 2 * cs->bo_capacity);
struct tu_bo **new_bos =
realloc(cs->bos, new_capacity * sizeof(struct tu_bo *));
if (!new_bos)
abort();
cs->bo_capacity = new_capacity;
cs->bos = new_bos;
}
uint32_t new_size = MAX2(16384, reserve_size * sizeof(uint32_t));
if (cs->bo_count)
new_size = MAX2(new_size, cs->bos[cs->bo_count - 1]->size * 2);
struct tu_bo *new_bo = malloc(sizeof(struct tu_bo));
if (!new_bo)
abort();
VkResult result = tu_bo_init_new(dev, new_bo, new_size);
if (result != VK_SUCCESS) {
free(new_bo);
VkResult result = tu_cs_add_bo(dev, cs, new_size);
if (result != VK_SUCCESS)
return result;
}
result = tu_bo_map(dev, new_bo);
if (result != VK_SUCCESS) {
tu_bo_finish(dev, new_bo);
free(new_bo);
return result;
}
cs->bos[cs->bo_count] = new_bo;
++cs->bo_count;
cs->start = cs->cur = (uint32_t *) new_bo->map;
cs->end = cs->start + new_bo->size / sizeof(uint32_t);
}
cs->start = cs->cur;