fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-05 06:50:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nvk: Remove gart from the name of cond_render_mem

Browse source 
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37187>
This commit is contained in:
Mel Henning 2025-09-04 14:29:49 -04:00 • committed by Marge Bot
parent a89f897870
commit 0b43a625f4
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/nouveau/vulkan/nvk_cmd_buffer.c
View file

@ -121,8 +121,8 @@ nvk_reset_cmd_buffer(struct vk_command_buffer *vk_cmd_buffer,
cmd->push_mem = NULL;
cmd->push_mem_limit = NULL;
cmd->push = (struct nv_push) {0};
cmd->cond_render_gart_mem = NULL;
cmd->cond_render_gart_offset = 0;
cmd->cond_render_mem = NULL;
cmd->cond_render_offset = 0;
util_dynarray_clear(&cmd->pushes);
@ -304,14 +304,14 @@ VkResult
nvk_cmd_buffer_cond_render_alloc(struct nvk_cmd_buffer *cmd,
uint64_t *addr)
{
uint32_t offset = cmd->cond_render_gart_offset;
uint32_t offset = cmd->cond_render_offset;
uint32_t size = 64;
assert(offset <= NVK_CMD_MEM_SIZE);
if (cmd->cond_render_gart_mem != NULL && size <= NVK_CMD_MEM_SIZE - offset) {
*addr = cmd->cond_render_gart_mem->mem->va->addr + offset;
if (cmd->cond_render_mem != NULL && size <= NVK_CMD_MEM_SIZE - offset) {
*addr = cmd->cond_render_mem->mem->va->addr + offset;
cmd->cond_render_gart_offset = offset + size;
cmd->cond_render_offset = offset + size;
return VK_SUCCESS;
}
@ -329,9 +329,9 @@ nvk_cmd_buffer_cond_render_alloc(struct nvk_cmd_buffer *cmd,
* upload BO on this one allocation and continuing on the current upload
* BO.
*/
if (cmd->cond_render_gart_mem == NULL || size < cmd->cond_render_gart_offset) {
cmd->cond_render_gart_mem = mem;
cmd->cond_render_gart_offset = size;
if (cmd->cond_render_mem == NULL || size < cmd->cond_render_offset) {
cmd->cond_render_mem = mem;
cmd->cond_render_offset = size;
}
return VK_SUCCESS;

4
src/nouveau/vulkan/nvk_cmd_buffer.h
View file

@ -222,8 +222,8 @@ struct nvk_cmd_buffer {
struct nvk_cmd_mem *upload_mem;
uint32_t upload_offset;
struct nvk_cmd_mem *cond_render_gart_mem;
uint32_t cond_render_gart_offset;
struct nvk_cmd_mem *cond_render_mem;
uint32_t cond_render_offset;
struct nvk_cmd_mem *push_mem;
uint32_t *push_mem_limit;