KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v3dv/cmd_buffer: push constants not using descriptor anymore 

v3dv_descriptor is going to be expanded with more data, so it doesn't
make sense anymore to handle a fake descriptor for the push
constants. Introducing a new struct, that is just a pair
bo/offset. Initially named v3dv_resource, as it could be the base to
reuse bos for different resources (like assembly bo)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6766>
This commit is contained in:
Alejandro Piñeiro 2020-03-16 12:34:02 +01:00 committed by Marge Bot
parent ca186f7291
commit f2d16529d1
3 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/broadcom/vulkan/v3dv_cmd_buffer.c
View File

@ -209,8 +209,8 @@ cmd_buffer_free_resources(struct v3dv_cmd_buffer *cmd_buffer)
vk_free(&cmd_buffer->pool->alloc, cmd_buffer->state.attachments);
}
if (cmd_buffer->push_constants_descriptor.bo)
v3dv_bo_free(cmd_buffer->device, cmd_buffer->push_constants_descriptor.bo);
if (cmd_buffer->push_constants_resource.bo)
v3dv_bo_free(cmd_buffer->device, cmd_buffer->push_constants_resource.bo);
}
static void

12
src/broadcom/vulkan/v3dv_private.h
View File

@ -672,6 +672,16 @@ struct v3dv_descriptor {
uint32_t offset;
};
/* Aux struct as it is really common to have a pair bo/address. Called
* resource because it is really likely that we would need something like that
* if we work on reuse the same bo at different points (like the shader
* assembly).
*/
struct v3dv_resource {
struct v3dv_bo *bo;
uint32_t offset;
};
struct v3dv_cmd_buffer {
VK_LOADER_DATA _loader_data;
@ -688,7 +698,7 @@ struct v3dv_cmd_buffer {
struct v3dv_cmd_buffer_state state;
uint32_t push_constants_data[MAX_PUSH_CONSTANTS_SIZE / 4];
struct v3dv_descriptor push_constants_descriptor;
struct v3dv_resource push_constants_resource;
/* List of jobs to submit to the kernel */
struct list_head submit_jobs;

38
src/broadcom/vulkan/v3dv_uniforms.c
View File

@ -100,26 +100,26 @@ check_push_constants_ubo(struct v3dv_cmd_buffer *cmd_buffer)
cmd_buffer->state.pipeline->layout->push_constant_size == 0)
return;
if (cmd_buffer->push_constants_descriptor.bo == NULL) {
cmd_buffer->push_constants_descriptor.bo =
if (cmd_buffer->push_constants_resource.bo == NULL) {
cmd_buffer->push_constants_resource.bo =
v3dv_bo_alloc(cmd_buffer->device, MAX_PUSH_CONSTANTS_SIZE, "push constants");
if (!cmd_buffer->push_constants_descriptor.bo) {
if (!cmd_buffer->push_constants_resource.bo) {
fprintf(stderr, "Failed to allocate memory for push constants\n");
abort();
}
bool ok = v3dv_bo_map(cmd_buffer->device,
cmd_buffer->push_constants_descriptor.bo,
cmd_buffer->push_constants_resource.bo,
MAX_PUSH_CONSTANTS_SIZE);
if (!ok) {
fprintf(stderr, "failed to map push constants buffer\n");
abort();
}
} else {
if (cmd_buffer->push_constants_descriptor.offset + MAX_PUSH_CONSTANTS_SIZE <=
cmd_buffer->push_constants_descriptor.bo->size) {
cmd_buffer->push_constants_descriptor.offset += MAX_PUSH_CONSTANTS_SIZE;
if (cmd_buffer->push_constants_resource.offset + MAX_PUSH_CONSTANTS_SIZE <=
cmd_buffer->push_constants_resource.bo->size) {
cmd_buffer->push_constants_resource.offset += MAX_PUSH_CONSTANTS_SIZE;
} else {
/* FIXME: we got out of space for push descriptors. Should we create
* a new bo? This could be easier with a uploader
@ -127,8 +127,8 @@ check_push_constants_ubo(struct v3dv_cmd_buffer *cmd_buffer)
}
}
memcpy(cmd_buffer->push_constants_descriptor.bo->map +
cmd_buffer->push_constants_descriptor.offset,
memcpy(cmd_buffer->push_constants_resource.bo->map +
cmd_buffer->push_constants_resource.offset,
cmd_buffer->push_constants_data,
MAX_PUSH_CONSTANTS_SIZE);
@ -206,7 +206,6 @@ v3dv_write_uniforms(struct v3dv_cmd_buffer *cmd_buffer,
/* For ubos, index is shifted, as 0 is reserved for push constants.
*/
struct v3dv_descriptor *descriptor = NULL;
if (uinfo->contents[i] == QUNIFORM_UBO_ADDR &&
v3d_unit_data_get_unit(data) == 0) {
/* This calls is to ensure that the push_constant_ubo is
@ -215,23 +214,32 @@ v3dv_write_uniforms(struct v3dv_cmd_buffer *cmd_buffer,
*/
check_push_constants_ubo(cmd_buffer);
descriptor = &cmd_buffer->push_constants_descriptor;
struct v3dv_resource *resource =
&cmd_buffer->push_constants_resource;
assert(resource->bo);
cl_aligned_reloc(&job->indirect, &uniforms,
resource->bo,
resource->offset + offset + dynamic_offset);
} else {
uint32_t index =
uinfo->contents[i] == QUNIFORM_UBO_ADDR ?
v3d_unit_data_get_unit(data) - 1 :
data;
descriptor =
struct v3dv_descriptor *descriptor =
get_descriptor(descriptor_state, map,
pipeline->layout,
index, &dynamic_offset);
assert(descriptor);
assert(descriptor->bo);
cl_aligned_reloc(&job->indirect, &uniforms,
descriptor->bo,
descriptor->offset + offset + dynamic_offset);
}
cl_aligned_reloc(&job->indirect, &uniforms,
descriptor->bo,
descriptor->offset + offset + dynamic_offset);
break;
}