Re: [PULL 33/33] ui/dbus: use shared D3D11 Texture2D when possible

[Mark Cave-Ayland]

On 29/06/2023 08:40, Richard Henderson wrote:

> On 6/27/23 15:02, marcandre.lureau@redhat.com wrote:
> >   static void dbus_update_gl_cb(GObject *source_object,
> > -                           GAsyncResult *res,
> > -                           gpointer user_data)
> > +                              GAsyncResult *res,
> > +                              gpointer user_data)
> >   {
> >       g_autoptr(GError) err = NULL;
> >       DBusDisplayListener *ddl = user_data;
> > +    bool success;
> > +
> > +#ifdef CONFIG_GBM
> > +    success = qemu_dbus_display1_listener_call_update_dmabuf_finish(
> > +        ddl->proxy, res, &err);
> > +#endif
> > +
> > +#ifdef WIN32
> > +    success = 
> > qemu_dbus_display1_listener_win32_d3d11_call_update_texture2d_finish(
> > +        ddl->d3d11_proxy, res, &err);
> > +    d3d_texture2d_acquire0(ddl->d3d_texture, &error_warn);
> > +#endif
> > -    if (!qemu_dbus_display1_listener_call_update_dmabuf_finish(ddl->proxy,
> > -                                                               res, &err)) {
> > +    if (!success) {
> >           error_report("Failed to call update: %s", err->message);
> >       }
>
> With neither CONFIG_GBM nor WIN32, success is not set:
>
> ../alt/ui/dbus-listener.c:199:10: error: variable 'success' is uninitialized when 
> used here [-Werror,-Wuninitialized]
>      if (!success) {
>           ^~~~~~~

I'm seeing something similar to this on my builds of git master this morning:

cc -m64 -mcx16 -Ilibcommon.fa.p -Iui -I../ui -I/usr/include/pixman-1 
-I/usr/include/libpng16 -I/usr/include/spice-server -I/usr/include/spice-1 
-I/usr/include/p11-kit-1 -I/usr/include/SDL2 -I/usr/include/libmount 
-I/usr/include/blkid -I/usr/include/glib-2.0 
-I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/gio-unix-2.0 
-I/usr/include/slirp -I/usr/include/gtk-3.0 -I/usr/include/at-spi2-atk/2.0 
-I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 
-I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/cairo 
-I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/harfbuzz 
-I/usr/include/atk-1.0 -I/usr/include/uuid -I/usr/include/freetype2 
-I/usr/include/gdk-pixbuf-2.0 -I/usr/include/vte-2.91 -I/usr/include/cacard 
-I/usr/include/nss -I/usr/include/nspr -I/usr/include/PCSC -I/usr/include/libusb-1.0 
-fdiagnostics-color=auto -Wall -Winvalid-pch -Werror -std=gnu11 -O0 -g 
-fstack-protector-strong -Wundef -Wwrite-strings -Wmissing-prototypes 
-Wstrict-prototypes -Wredundant-decls -Wold-style-declaration -Wold-style-definition 
-Wtype-limits -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers 
-Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined 
-Wimplicit-fallthrough=2 -Wmissing-format-attribute -Wno-missing-include-dirs 
-Wno-shift-negative-value -Wno-psabi -isystem 
/home/build/src/qemu/git/qemu/linux-headers -isystem linux-headers -iquote . -iquote 
/home/build/src/qemu/git/qemu -iquote /home/build/src/qemu/git/qemu/include -iquote 
/home/build/src/qemu/git/qemu/host/include/x86_64 -iquote 
/home/build/src/qemu/git/qemu/host/include/generic -iquote 
/home/build/src/qemu/git/qemu/tcg/i386 -pthread -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 
-D_LARGEFILE_SOURCE -fno-strict-aliasing -fno-common -fwrapv -fPIE -D_DEFAULT_SOURCE 
-D_XOPEN_SOURCE=600 -DNCURSES_WIDECHAR=1 -D_REENTRANT -DSTRUCT_IOVEC_DEFINED -MD -MQ 
libcommon.fa.p/ui_dbus-listener.c.o -MF libcommon.fa.p/ui_dbus-listener.c.o.d -o 
libcommon.fa.p/ui_dbus-listener.c.o -c ../ui/dbus-listener.c
../ui/dbus-listener.c: In function ‘dbus_call_update_gl’:
../ui/dbus-listener.c:210:26: error: unused variable ‘ddl’ 
[-Werror=unused-variable]
  210 |     DBusDisplayListener *ddl = container_of(dcl, DBusDisplayListener, 
dcl);
      |                          ^~~
At top level:
../ui/dbus-listener.c:180:13: error: ‘dbus_update_gl_cb’ defined but not used 
[-Werror=unused-function]
  180 | static void dbus_update_gl_cb(GObject *source_object,
      |             ^~~~~~~~~~~~~~~~~
../ui/dbus-listener.c: In function ‘dbus_update_gl_cb’:
../ui/dbus-listener.c:199:9: error: ‘success’ is used uninitialized in this function 
[-Werror=uninitialized]
  199 |     if (!success) {
      |         ^~~~~~~~
cc1: all warnings being treated as errors
ninja: build stopped: subcommand failed.


ATB,

Mark.