From c400fa761c80ede03494445d5ca8fe0d214896fa Mon Sep 17 00:00:00 2001 From: libretroadmin Date: Thu, 27 Apr 2023 03:02:00 +0200 Subject: [PATCH] (UI companion driver) Remove unused notify_content_loaded --- frontend/drivers/platform_darwin.m | 7 +------ gfx/drivers/d3d12.c | 17 ++++++++++------- ui/drivers/ui_cocoa.m | 2 -- ui/drivers/ui_qt.cpp | 3 --- ui/drivers/ui_win32.c | 2 -- ui/ui_companion_driver.c | 9 --------- ui/ui_companion_driver.h | 3 --- 7 files changed, 11 insertions(+), 32 deletions(-) diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m index 94419b81b3..b661ab4ccb 100644 --- a/frontend/drivers/platform_darwin.m +++ b/frontend/drivers/platform_darwin.m @@ -482,11 +482,6 @@ static void frontend_darwin_get_env(int *argc, char *argv[], #endif } -static void frontend_darwin_content_loaded(void) -{ - ui_companion_driver_notify_content_loaded(); -} - static int frontend_darwin_get_rating(void) { char model[PATH_MAX_LENGTH] = {0}; @@ -953,7 +948,7 @@ frontend_ctx_driver_t frontend_ctx_darwin = { frontend_darwin_get_name, /* get_name */ frontend_darwin_get_os, /* get_os */ frontend_darwin_get_rating, /* get_rating */ - frontend_darwin_content_loaded, /* content_loaded */ + NULL, /* content_loaded */ frontend_darwin_get_arch, /* get_architecture */ frontend_darwin_get_powerstate, /* get_powerstate */ frontend_darwin_parse_drive_list,/* parse_drive_list */ diff --git a/gfx/drivers/d3d12.c b/gfx/drivers/d3d12.c index 32d7dbac97..0d2d437b4d 100644 --- a/gfx/drivers/d3d12.c +++ b/gfx/drivers/d3d12.c @@ -3127,21 +3127,24 @@ static uintptr_t d3d12_gfx_load_texture( static void d3d12_gfx_unload_texture(void* data, bool threaded, uintptr_t handle) { - D3D12Fence fence; d3d12_texture_t* texture = (d3d12_texture_t*)handle; d3d12_video_t* d3d12 = (d3d12_video_t*)data; if (!texture) return; - fence = d3d12->queue.fence; - - if (fence->lpVtbl->GetCompletedValue(fence) < d3d12->queue.fenceValue) + if (d3d12) { - fence->lpVtbl->SetEventOnCompletion( - fence, d3d12->queue.fenceValue, d3d12->queue.fenceEvent); - WaitForSingleObject(d3d12->queue.fenceEvent, INFINITE); + D3D12Fence fence = d3d12->queue.fence; + + if (fence->lpVtbl->GetCompletedValue(fence) < d3d12->queue.fenceValue) + { + fence->lpVtbl->SetEventOnCompletion( + fence, d3d12->queue.fenceValue, d3d12->queue.fenceEvent); + WaitForSingleObject(d3d12->queue.fenceEvent, INFINITE); + } } + d3d12_release_texture(texture); free(texture); } diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m index 3859e587cb..b2041e9a0a 100644 --- a/ui/drivers/ui_cocoa.m +++ b/ui/drivers/ui_cocoa.m @@ -1073,7 +1073,6 @@ static void ui_companion_cocoa_deinit(void *data) } static void *ui_companion_cocoa_init(void) { return (void*)-1; } -static void ui_companion_cocoa_notify_content_loaded(void *data) { } static void ui_companion_cocoa_toggle(void *data, bool force) { } static void ui_companion_cocoa_event_command(void *data, enum event_command cmd) { @@ -1100,7 +1099,6 @@ ui_companion_driver_t ui_companion_cocoa = { ui_companion_cocoa_deinit, ui_companion_cocoa_toggle, ui_companion_cocoa_event_command, - ui_companion_cocoa_notify_content_loaded, NULL, /* notify_refresh */ NULL, /* msg_queue_push */ NULL, /* render_messagebox */ diff --git a/ui/drivers/ui_qt.cpp b/ui/drivers/ui_qt.cpp index 12758c0ce5..bc97ce403c 100644 --- a/ui/drivers/ui_qt.cpp +++ b/ui/drivers/ui_qt.cpp @@ -4821,8 +4821,6 @@ static void* ui_companion_qt_init(void) return handle; } -static void ui_companion_qt_notify_content_loaded(void *data) { } - static void ui_companion_qt_toggle(void *data, bool force) { static bool already_started = false; @@ -4925,7 +4923,6 @@ ui_companion_driver_t ui_companion_qt = { ui_companion_qt_deinit, ui_companion_qt_toggle, ui_companion_qt_event_command, - ui_companion_qt_notify_content_loaded, ui_companion_qt_notify_refresh, ui_companion_qt_msg_queue_push, NULL, diff --git a/ui/drivers/ui_win32.c b/ui/drivers/ui_win32.c index bd47f94858..472f3dff1d 100644 --- a/ui/drivers/ui_win32.c +++ b/ui/drivers/ui_win32.c @@ -312,7 +312,6 @@ static ui_browser_window_t ui_browser_window_win32 = { static void ui_companion_win32_deinit(void *data) { } static void *ui_companion_win32_init(void) { return (void*)-1; } -static void ui_companion_win32_notify_content_loaded(void *data) { } static void ui_companion_win32_toggle(void *data, bool force) { } static void ui_companion_win32_event_command( void *data, enum event_command cmd) { } @@ -322,7 +321,6 @@ ui_companion_driver_t ui_companion_win32 = { ui_companion_win32_deinit, ui_companion_win32_toggle, ui_companion_win32_event_command, - ui_companion_win32_notify_content_loaded, NULL, NULL, NULL, diff --git a/ui/ui_companion_driver.c b/ui/ui_companion_driver.c index bb50715985..f8b16fdf86 100644 --- a/ui/ui_companion_driver.c +++ b/ui/ui_companion_driver.c @@ -32,7 +32,6 @@ static ui_companion_driver_t ui_companion_null = { NULL, /* deinit */ NULL, /* toggle */ NULL, /* event_command */ - NULL, /* notify_content_loaded */ NULL, /* notify_refresh */ NULL, /* msg_queue_push */ NULL, /* render_messagebox */ @@ -177,14 +176,6 @@ void ui_companion_driver_notify_refresh(void) #endif } -void ui_companion_driver_notify_content_loaded(void) -{ - uico_driver_state_t *uico_st = &uico_driver_st; - const ui_companion_driver_t *ui = uico_st->drv; - if (ui && ui->notify_content_loaded) - ui->notify_content_loaded(uico_st->data); -} - const ui_msg_window_t *ui_companion_driver_get_msg_window_ptr(void) { uico_driver_state_t *uico_st = &uico_driver_st; diff --git a/ui/ui_companion_driver.h b/ui/ui_companion_driver.h index 9035175db6..d48cebfe91 100644 --- a/ui/ui_companion_driver.h +++ b/ui/ui_companion_driver.h @@ -118,7 +118,6 @@ typedef struct ui_companion_driver void (*deinit)(void *data); void (*toggle)(void *data, bool force); void (*event_command)(void *data, enum event_command action); - void (*notify_content_loaded)(void *data); void (*notify_refresh)(void *data); void (*msg_queue_push)(void *data, const char *msg, unsigned priority, unsigned duration, bool flush); void (*render_messagebox)(const char *msg); @@ -160,8 +159,6 @@ void ui_companion_event_command(enum event_command action); void ui_companion_driver_notify_refresh(void); -void ui_companion_driver_notify_content_loaded(void); - const ui_msg_window_t *ui_companion_driver_get_msg_window_ptr(void); const ui_browser_window_t *ui_companion_driver_get_browser_window_ptr(void);