eden-emu/SDL
15
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-05-29 07:59:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

GPU: More robust error reporting (#10958)

Browse source 
---------

Co-authored-by: Ethan Lee <flibitijibibo@gmail.com>
Co-authored-by: Caleb Cornett <caleb.cornett@outlook.com>
This commit is contained in:
Evan Hemsley 2024-09-27 00:30:18 -07:00 • committed by GitHub
parent 48e213b4cd
commit be401dd1e3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 805 additions and 844 deletions
Download patch file Download diff file Expand all files Collapse all files

68
src/gpu/SDL_gpu.c
View file

@ -28,16 +28,22 @@
return retval; \
}
#define CHECK_COMMAND_BUFFER \
#define CHECK_COMMAND_BUFFER \
if (((CommandBufferCommonHeader *)command_buffer)->submitted) { \
SDL_assert_release(!"Command buffer already submitted!"); \
return; \
SDL_assert_release(!"Command buffer already submitted!"); \
return; \
}
#define CHECK_COMMAND_BUFFER_RETURN_NULL \
#define CHECK_COMMAND_BUFFER_RETURN_FALSE \
if (((CommandBufferCommonHeader *)command_buffer)->submitted) { \
SDL_assert_release(!"Command buffer already submitted!"); \
return NULL; \
SDL_assert_release(!"Command buffer already submitted!"); \
return false; \
}
#define CHECK_COMMAND_BUFFER_RETURN_NULL \
if (((CommandBufferCommonHeader *)command_buffer)->submitted) { \
SDL_assert_release(!"Command buffer already submitted!"); \
return NULL; \
}
#define CHECK_ANY_PASS_IN_PROGRESS(msg, retval) \
@ -2594,65 +2600,59 @@ SDL_GPUTextureFormat SDL_GetGPUSwapchainTextureFormat(
window);
}
SDL_GPUTexture *SDL_AcquireGPUSwapchainTexture(
bool SDL_AcquireGPUSwapchainTexture(
SDL_GPUCommandBuffer *command_buffer,
SDL_Window *window,
Uint32 *w,
Uint32 *h)
SDL_GPUTexture **swapchainTexture)
{
if (command_buffer == NULL) {
SDL_InvalidParamError("command_buffer");
return NULL;
return false;
}
if (window == NULL) {
SDL_InvalidParamError("window");
return NULL;
return false;
}
if (w == NULL) {
SDL_InvalidParamError("w");
return NULL;
}
if (h == NULL) {
SDL_InvalidParamError("h");
return NULL;
if (swapchainTexture == NULL) {
SDL_InvalidParamError("swapchainTexture");
return false;
}
if (COMMAND_BUFFER_DEVICE->debug_mode) {
CHECK_COMMAND_BUFFER_RETURN_NULL
CHECK_ANY_PASS_IN_PROGRESS("Cannot acquire a swapchain texture during a pass!", NULL)
CHECK_COMMAND_BUFFER_RETURN_FALSE
CHECK_ANY_PASS_IN_PROGRESS("Cannot acquire a swapchain texture during a pass!", false)
}
return COMMAND_BUFFER_DEVICE->AcquireSwapchainTexture(
command_buffer,
window,
w,
h);
swapchainTexture);
}
void SDL_SubmitGPUCommandBuffer(
bool SDL_SubmitGPUCommandBuffer(
SDL_GPUCommandBuffer *command_buffer)
{
CommandBufferCommonHeader *commandBufferHeader = (CommandBufferCommonHeader *)command_buffer;
if (command_buffer == NULL) {
SDL_InvalidParamError("command_buffer");
return;
return false;
}
if (COMMAND_BUFFER_DEVICE->debug_mode) {
CHECK_COMMAND_BUFFER
CHECK_COMMAND_BUFFER_RETURN_FALSE
if (
commandBufferHeader->render_pass.in_progress ||
commandBufferHeader->compute_pass.in_progress ||
commandBufferHeader->copy_pass.in_progress) {
SDL_assert_release(!"Cannot submit command buffer while a pass is in progress!");
return;
return false;
}
}
commandBufferHeader->submitted = true;
COMMAND_BUFFER_DEVICE->Submit(
return COMMAND_BUFFER_DEVICE->Submit(
command_buffer);
}
@ -2683,28 +2683,28 @@ SDL_GPUFence *SDL_SubmitGPUCommandBufferAndAcquireFence(
command_buffer);
}
void SDL_WaitForGPUIdle(
bool SDL_WaitForGPUIdle(
SDL_GPUDevice *device)
{
CHECK_DEVICE_MAGIC(device, );
CHECK_DEVICE_MAGIC(device, false);
device->Wait(
return device->Wait(
device->driverData);
}
void SDL_WaitForGPUFences(
bool SDL_WaitForGPUFences(
SDL_GPUDevice *device,
bool wait_all,
SDL_GPUFence *const *fences,
Uint32 num_fences)
{
CHECK_DEVICE_MAGIC(device, );
CHECK_DEVICE_MAGIC(device, false);
if (fences == NULL && num_fences > 0) {
SDL_InvalidParamError("fences");
return;
return false;
}
device->WaitForFences(
return device->WaitForFences(
device->driverData,
wait_all,
fences,