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

nvk: Also store the push BO map in nvk_queue_state

Browse Source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
This commit is contained in:
Faith Ekstrand
2023-01-30 20:11:59 -06:00
committed by Marge Bot
parent 23aaa4e179
commit 13c73e3214
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nouveau/vulkan/nvk_queue.c
+7 -4
View File
@@ -28,8 +28,10 @@ nvk_queue_state_finish(struct nvk_device *dev,
nouveau_ws_bo_destroy(qs->samplers.bo);
if (qs->slm.bo)
nouveau_ws_bo_destroy(qs->slm.bo);
if (qs->push.bo)
if (qs->push.bo) {
nouveau_ws_bo_unmap(qs->push.bo, qs->push.bo_map);
nouveau_ws_bo_destroy(qs->push.bo);
}
}
VkResult
@@ -211,12 +213,13 @@ nvk_queue_state_update(struct nvk_device *dev,
*/
P_IMMD(p, NV9097, SET_SHADER_LOCAL_MEMORY_WINDOW, 0xff << 24);
nouveau_ws_bo_unmap(push_bo, push_map);
if (qs->push.bo)
if (qs->push.bo) {
nouveau_ws_bo_unmap(qs->push.bo, qs->push.bo_map);
nouveau_ws_bo_destroy(qs->push.bo);
}
qs->push.bo = push_bo;
qs->push.bo_map = push_map;
qs->push.dw_count = nv_push_dw_count(&push);
return VK_SUCCESS;
src/nouveau/vulkan/nvk_queue.h
+1
View File
@@ -28,6 +28,7 @@ struct nvk_queue_state {
struct {
struct nouveau_ws_bo *bo;
void *bo_map;
uint32_t dw_count;
} push;
};