Changeset 96662 in vbox for trunk/src/VBox

Timestamp:

Sep 8, 2022 9:22:45 PM (2 years ago)

Author:

vboxsync

Message:

Add/3D/mesa,WDDM: Don't release the presentation group reference at the end of NineDevice9_ctor, makes little sense to consume a reference for the pPresentationFactory parameter but not the pD3D9Ex one.

Location:

trunk/src/VBox/Additions

Files:

• 3D/mesa/mesa-21.3.8/src/gallium/frontends/nine/device9.c (modified) (1 diff)
• WINNT/Graphics/Video/disp/wddm/gallium/VBoxGaD3DDevice9Ex.cpp (modified) (1 diff)

trunk/src/VBox/Additions/3D/mesa/mesa-21.3.8/src/gallium/frontends/nine/device9.c

@@ -581 +581 @@
     nine_state_init_sw(This);
 
+#ifndef VBOX /* VBox: Releasing this here would mean the constructor consumes a reference. This is inconsistent with how the
+                      pD3D9 parameter is treated, so, assume this is wrong and pD3D9 is right. */
     ID3DPresentGroup_Release(This->present);
+#endif
     nine_context_update_state(This); /* Some drivers needs states to be initialized */
     nine_csmt_process(This);

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/gallium/VBoxGaD3DDevice9Ex.cpp

@@ -74 +74 @@
     if (SUCCEEDED(hr))
     {
+        /** @todo r=bird: The mpPresentationGroup parameter seems to always have been
+         * consumed by the NineDevice9_ctor() code, while for the mpD3D9Ex parameter
+         * it grabs a reference.  I've commented out the bogus looking
+         * ID3DPresentGroup_Release call from NineDevice9_ctor() rather than balancing
+         * reference to mpPresentionGroup here based on the hr value. See r153545.
+         * Please verify and rework the fix to your liking.
+         *
+         * (The release call in cleanup() would call into no man's land early during
+         * vlc.exe (v3.0.17.4) video startup on 32-bit w7 rtm.)
+         */
         hr = D3DAdapter9_CreateDeviceEx(mpD3D9Ex->GetAdapter9(),
                                         D3DADAPTER_DEFAULT, DeviceType,