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

nvk: Rename nvk_cmd_buffr_get_cbuf_descriptor()

Browse Source 
This makes it clear that it returns an address, not a descriptor.  That
distinction will matter soon.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29591>
This commit is contained in:
Faith Ekstrand
2024-06-13 08:47:15 -05:00
committed by Marge Bot
parent 59303584e3
commit cbe62813a1
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/nouveau/vulkan/nvk_cmd_buffer.c
View File

@@ -798,15 +798,15 @@ nvk_cmd_buffer_flush_push_descriptors(struct nvk_cmd_buffer *cmd,
}
bool
nvk_cmd_buffer_get_cbuf_descriptor(struct nvk_cmd_buffer *cmd,
const struct nvk_descriptor_state *desc,
const struct nvk_shader *shader,
const struct nvk_cbuf *cbuf,
struct nvk_buffer_address *desc_out)
nvk_cmd_buffer_get_cbuf_addr(struct nvk_cmd_buffer *cmd,
const struct nvk_descriptor_state *desc,
const struct nvk_shader *shader,
const struct nvk_cbuf *cbuf,
struct nvk_buffer_address *addr_out)
{
switch (cbuf->type) {
case NVK_CBUF_TYPE_INVALID:
*desc_out = (struct nvk_buffer_address) { .size = 0 };
*addr_out = (struct nvk_buffer_address) { .size = 0 };
return true;
case NVK_CBUF_TYPE_ROOT_DESC:
@@ -814,20 +814,20 @@ nvk_cmd_buffer_get_cbuf_descriptor(struct nvk_cmd_buffer *cmd,
return false;
case NVK_CBUF_TYPE_SHADER_DATA:
*desc_out = (struct nvk_buffer_address) {
*addr_out = (struct nvk_buffer_address) {
.base_addr = shader->data_addr,
.size = shader->data_size,
};
return true;
case NVK_CBUF_TYPE_DESC_SET:
*desc_out = desc->root.sets[cbuf->desc_set];
*addr_out = desc->root.sets[cbuf->desc_set];
return true;
case NVK_CBUF_TYPE_DYNAMIC_UBO: {
const uint32_t dyn_start =
desc->root.set_dynamic_buffer_start[cbuf->desc_set];
*desc_out = desc->root.dynamic_buffers[dyn_start + cbuf->dynamic_idx];
*addr_out = desc->root.dynamic_buffers[dyn_start + cbuf->dynamic_idx];
return true;
}
@@ -841,7 +841,7 @@ nvk_cmd_buffer_get_cbuf_descriptor(struct nvk_cmd_buffer *cmd,
assert(cbuf->desc_offset < NVK_PUSH_DESCRIPTOR_SET_SIZE);
void *desc = &push->data[cbuf->desc_offset];
*desc_out = *(struct nvk_buffer_address *)desc;
*addr_out = *(struct nvk_buffer_address *)desc;
return true;
}

10
src/nouveau/vulkan/nvk_cmd_buffer.h
View File

@@ -272,11 +272,11 @@ nvk_cmd_buffer_flush_push_descriptors(struct nvk_cmd_buffer *cmd,
struct nvk_descriptor_state *desc);
bool
nvk_cmd_buffer_get_cbuf_descriptor(struct nvk_cmd_buffer *cmd,
const struct nvk_descriptor_state *desc,
const struct nvk_shader *shader,
const struct nvk_cbuf *cbuf,
struct nvk_buffer_address *desc_out);
nvk_cmd_buffer_get_cbuf_addr(struct nvk_cmd_buffer *cmd,
const struct nvk_descriptor_state *desc,
const struct nvk_shader *shader,
const struct nvk_cbuf *cbuf,
struct nvk_buffer_address *addr_out);
uint64_t
nvk_cmd_buffer_get_cbuf_descriptor_addr(struct nvk_cmd_buffer *cmd,
const struct nvk_descriptor_state *desc,

2
src/nouveau/vulkan/nvk_cmd_dispatch.c
View File

@@ -157,7 +157,7 @@ nvk_flush_compute_state(struct nvk_cmd_buffer *cmd,
};
} else {
ASSERTED bool direct_descriptor =
nvk_cmd_buffer_get_cbuf_descriptor(cmd, desc, shader, cbuf, &ba);
nvk_cmd_buffer_get_cbuf_addr(cmd, desc, shader, cbuf, &ba);
assert(direct_descriptor);
}

2
src/nouveau/vulkan/nvk_cmd_draw.c
View File

@@ -2364,7 +2364,7 @@ nvk_flush_descriptors(struct nvk_cmd_buffer *cmd)
}
struct nvk_buffer_address ba;
if (nvk_cmd_buffer_get_cbuf_descriptor(cmd, desc, shader, cbuf, &ba)) {
if (nvk_cmd_buffer_get_cbuf_addr(cmd, desc, shader, cbuf, &ba)) {
assert(ba.base_addr % min_cbuf_alignment == 0);
ba.size = align(ba.size, min_cbuf_alignment);
ba.size = MIN2(ba.size, NVK_MAX_CBUF_SIZE);