summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2022-02-01 15:57:36 +0100
committerEric Engestrom <eric@engestrom.ch>2022-02-09 20:07:49 +0000
commitfe18c96c86b7fcd39836c0915c806acc9a2039b8 (patch)
treea68b04b12eb8a52136e1a5d2aba0608f72bfdb62
parent2027acff500d143bc911139545bc86ab8f7ef37f (diff)
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@gmail.com> Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14821> (cherry picked from commit 1cadd19197aabd36f1da31740af8ff712bd66e6b)
-rw-r--r--.pick_status.json2
-rw-r--r--src/amd/vulkan/winsys/null/radv_null_bo.c8
2 files changed, 9 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 8b88cf8bafa..301dc7cb366 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2236,7 +2236,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;
}