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>
---
ui/dbus-listener.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c
index 09d7a319b1..b82e7c7115 100644
--- a/ui/dbus-listener.c
+++ b/ui/dbus-listener.c
@@ -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);
--
2.49.0