Mesa (staging/21.3): radv/winsys: fix missing buffer_make_resident() for the null winsys

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: 2e7105d0cf425d3155bbd0c8aee4329c93325b42
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2e7105d0cf425d3155bbd0c8aee4329c93325b42

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Tue Feb  1 15:57:36 2022 +0100

radv/winsys: fix missing buffer_make_resident() for the null winsys

With latest Fossilize everything should now be captured correctly
but without this, all Fossilize databases that need
VK_EXT_custom_border_color would just crash.

Cc: mesa-stable
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14821>
(cherry picked from commit 1cadd19197aabd36f1da31740af8ff712bd66e6b)

---

 .pick_status.json                         | 2 +-
 src/amd/vulkan/winsys/null/radv_null_bo.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index cf6d49440b9..2581de2491e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -436,7 +436,7 @@
         "description": "radv/winsys: fix missing buffer_make_resident() for the null winsys",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/amd/vulkan/winsys/null/radv_null_bo.c b/src/amd/vulkan/winsys/null/radv_null_bo.c
index 496b496bd56..d3df35763a5 100644
--- a/src/amd/vulkan/winsys/null/radv_null_bo.c
+++ b/src/amd/vulkan/winsys/null/radv_null_bo.c
@@ -65,6 +65,13 @@ radv_null_winsys_bo_unmap(struct radeon_winsys_bo *_bo)
 {
 }
 
+static VkResult
+radv_null_winsys_bo_make_resident(struct radeon_winsys *_ws, struct radeon_winsys_bo *_bo,
+                                  bool resident)
+{
+   return VK_SUCCESS;
+}
+
 static void
 radv_null_winsys_bo_destroy(struct radeon_winsys *_ws, struct radeon_winsys_bo *_bo)
 {
@@ -80,4 +87,5 @@ radv_null_bo_init_functions(struct radv_null_winsys *ws)
    ws->base.buffer_destroy = radv_null_winsys_bo_destroy;
    ws->base.buffer_map = radv_null_winsys_bo_map;
    ws->base.buffer_unmap = radv_null_winsys_bo_unmap;
+   ws->base.buffer_make_resident = radv_null_winsys_bo_make_resident;
 }