From 0370b92d800d0ede34dc0eb74fcf86ccc7386827 Mon Sep 17 00:00:00 2001
From: Anonymous Maarten <[EMAIL REDACTED]>
Date: Sun, 8 Dec 2024 18:03:26 +0100
Subject: [PATCH] gpu: SDL_ClaimWindowForGPUDevice must set an error message on
failure
---
src/gpu/d3d12/SDL_gpu_d3d12.c | 4 ++--
src/gpu/metal/SDL_gpu_metal.m | 3 +--
src/gpu/vulkan/SDL_gpu_vulkan.c | 3 +--
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/gpu/d3d12/SDL_gpu_d3d12.c b/src/gpu/d3d12/SDL_gpu_d3d12.c
index 1af6af10e777a..783407022edbb 100644
--- a/src/gpu/d3d12/SDL_gpu_d3d12.c
+++ b/src/gpu/d3d12/SDL_gpu_d3d12.c
@@ -6729,7 +6729,7 @@ static bool D3D12_ClaimWindow(
SET_STRING_ERROR_AND_RETURN("Could not create swapchain, failed to claim window!", false)
}
} else {
- SDL_LogWarn(SDL_LOG_CATEGORY_GPU, "Window already claimed!");
+ SET_STRING_ERROR_AND_RETURN("Window already claimed", false)
return false;
}
}
@@ -6742,7 +6742,7 @@ static void D3D12_ReleaseWindow(
D3D12WindowData *windowData = D3D12_INTERNAL_FetchWindowData(window);
if (windowData == NULL) {
- SDL_LogWarn(SDL_LOG_CATEGORY_GPU, "Window already unclaimed!");
+ SET_ERROR("Window already unclaimed!")
return;
}
diff --git a/src/gpu/metal/SDL_gpu_metal.m b/src/gpu/metal/SDL_gpu_metal.m
index ebea8d5f9984a..62f6aee0220b4 100644
--- a/src/gpu/metal/SDL_gpu_metal.m
+++ b/src/gpu/metal/SDL_gpu_metal.m
@@ -3624,8 +3624,7 @@ static bool METAL_ClaimWindow(
SET_STRING_ERROR_AND_RETURN("Could not create swapchain, failed to claim window", false);
}
} else {
- SDL_LogWarn(SDL_LOG_CATEGORY_GPU, "Window already claimed!");
- return false;
+ SET_ERROR_AND_RETURN("Window already claimed!", false)
}
}
}
diff --git a/src/gpu/vulkan/SDL_gpu_vulkan.c b/src/gpu/vulkan/SDL_gpu_vulkan.c
index b937455dbbd9b..6ecf95219f944 100644
--- a/src/gpu/vulkan/SDL_gpu_vulkan.c
+++ b/src/gpu/vulkan/SDL_gpu_vulkan.c
@@ -9585,8 +9585,7 @@ static bool VULKAN_ClaimWindow(
return false;
}
} else {
- SDL_LogWarn(SDL_LOG_CATEGORY_GPU, "Window already claimed!");
- return false;
+ SET_STRING_ERROR_AND_RETURN("Window already claimed!", false)
}
}