mirror of
https://github.com/qemu/qemu.git
synced 2026-02-04 02:24:51 +00:00
ui/dbus: Consistent handling of texture mutex failure
We report d3d_texture2d_acquire0() and d3d_texture2d_release0() failure as error, except in dbus_update_gl_cb(), where we report it as warning. Report it as error there as well. Cc: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-ID: <20250923091000.3180122-12-armbru@redhat.com> Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
This commit is contained in:
@@ -214,26 +214,31 @@ static void dbus_update_gl_cb(GObject *source_object,
|
||||
GAsyncResult *res,
|
||||
gpointer user_data)
|
||||
{
|
||||
g_autoptr(GError) err = NULL;
|
||||
g_autoptr(GError) gerr = NULL;
|
||||
#ifdef WIN32
|
||||
Error *err = NULL;
|
||||
#endif
|
||||
DBusDisplayListener *ddl = user_data;
|
||||
bool success;
|
||||
|
||||
#ifdef CONFIG_GBM
|
||||
success = qemu_dbus_display1_listener_call_update_dmabuf_finish(
|
||||
ddl->proxy, res, &err);
|
||||
ddl->proxy, res, &gerr);
|
||||
if (!success) {
|
||||
error_report("Failed to call update: %s", err->message);
|
||||
error_report("Failed to call update: %s", gerr->message);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef WIN32
|
||||
success = qemu_dbus_display1_listener_win32_d3d11_call_update_texture2d_finish(
|
||||
ddl->d3d11_proxy, res, &err);
|
||||
ddl->d3d11_proxy, res, &gerr);
|
||||
if (!success) {
|
||||
error_report("Failed to call update: %s", err->message);
|
||||
error_report("Failed to call update: %s", gerr->message);
|
||||
}
|
||||
|
||||
d3d_texture2d_acquire0(ddl->d3d_texture, &error_warn);
|
||||
if (!d3d_texture2d_acquire0(ddl->d3d_texture, &err)) {
|
||||
error_report_err(err);
|
||||
}
|
||||
#endif
|
||||
|
||||
graphic_hw_gl_block(ddl->dcl.con, false);
|
||||
|
||||
Reference in New Issue
Block a user