Changeset 99824 in vbox for trunk

Timestamp:

May 17, 2023 8:20:47 AM (20 months ago)

Author:

vboxsync

Message:

Devices/Graphics: correct assertion

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp

@@ -7058 +7058 @@
         vmsvgaR3GetCaps(pThis, pThisCC, &u32DeviceCaps, &u32DeviceCaps2, &u32FIFOCaps);
 
-        /* Capabilities should not change normally. */
-        Assert(   pThis->svga.u32DeviceCaps == u32DeviceCaps
-               && pThis->svga.u32DeviceCaps2 == u32DeviceCaps2
-               && pThisCC->svga.pau32FIFO[SVGA_FIFO_CAPABILITIES] == u32FIFOCaps);
+        /* Capabilities should not change normally.
+         * However the saved state might have a subset of currently implemented caps.
+         */
+        Assert(   (pThis->svga.u32DeviceCaps & u32DeviceCaps) == pThis->svga.u32DeviceCaps
+               && (pThis->svga.u32DeviceCaps2 & u32DeviceCaps2) == pThis->svga.u32DeviceCaps2
+               && (pThisCC->svga.pau32FIFO[SVGA_FIFO_CAPABILITIES] & u32FIFOCaps) == pThisCC->svga.pau32FIFO[SVGA_FIFO_CAPABILITIES]);
     }
 #endif