Changeset 100712 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Jul 26, 2023 10:38:25 PM (19 months ago)

Author:

vboxsync

Message:

Devices/Graphics: pre-initialize screen ids. bugref:9830

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA-cmd.cpp (modified) (4 diffs)
• DevVGA-SVGA.cpp (modified) (3 diffs)

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

@@ -1011 +1011 @@
         && pSVGAState->aScreens[idScreen].fDefined)
     {
+        Assert(pSVGAState->aScreens[idScreen].idScreen == idScreen);
         return &pSVGAState->aScreens[idScreen];
     }
@@ -1844 +1845 @@
         /** @todo Generic screen object/target interface. */
         VMSVGASCREENOBJECT *pScreen = &pSvgaR3State->aScreens[pCmd->stid];
+        Assert(pScreen->idScreen == pCmd->stid);
         pScreen->fDefined  = true;
         pScreen->fModified = true;
         pScreen->fuScreen  = SVGA_SCREEN_MUST_BE_SET
                            | (RT_BOOL(pCmd->flags & SVGA_STFLAG_PRIMARY) ? SVGA_SCREEN_IS_PRIMARY : 0);
-        pScreen->idScreen  = pCmd->stid;
 
         pScreen->xOrigin = pCmd->xRoot;
@@ -6756 +6757 @@
 
     VMSVGASCREENOBJECT *pScreen = &pSvgaR3State->aScreens[idScreen];
+    Assert(pScreen->idScreen == idScreen);
     pScreen->fDefined  = true;
     pScreen->fModified = true;
     pScreen->fuScreen  = pCmd->screen.flags;
-    pScreen->idScreen  = idScreen;
     if (!RT_BOOL(pCmd->screen.flags & (SVGA_SCREEN_DEACTIVATE | SVGA_SCREEN_BLANKING)))
     {
@@ -6802 +6803 @@
 
     VMSVGASCREENOBJECT *pScreen = &pSvgaR3State->aScreens[idScreen];
+    Assert(pScreen->idScreen == idScreen);
     vmsvgaR3DestroyScreen(pThis, pThisCC, pScreen);
 }

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

@@ -1682 +1682 @@
 
         VMSVGASCREENOBJECT *pScreen = &pSVGAState->aScreens[0];
+        Assert(pScreen->idScreen == 0);
         pScreen->fDefined  = true;
         pScreen->fModified = true;
         pScreen->fuScreen  = SVGA_SCREEN_MUST_BE_SET | SVGA_SCREEN_IS_PRIMARY;
-        pScreen->idScreen  = 0;
         pScreen->xOrigin   = 0;
         pScreen->yOrigin   = 0;
@@ -6018 +6018 @@
         /* Try to setup at least the first screen. */
         VMSVGASCREENOBJECT *pScreen = &pSVGAState->aScreens[0];
+        Assert(pScreen->idScreen == 0);
         pScreen->fDefined  = true;
         pScreen->fModified = true;
         pScreen->fuScreen  = SVGA_SCREEN_MUST_BE_SET | SVGA_SCREEN_IS_PRIMARY;
-        pScreen->idScreen  = 0;
         pScreen->xOrigin   = 0;
         pScreen->yOrigin   = 0;
@@ -6560 +6560 @@
     rc = RTCritSectInit(&pSVGAState->CritSectCmdBuf);
     AssertRCReturn(rc, rc);
+
+    /* Init screen ids which are constant and allow to use a pointer to aScreens element and know its index. */
+    for (uint32_t i = 0; i < RT_ELEMENTS(pSVGAState->aScreens); ++i)
+        pSVGAState->aScreens[i].idScreen = i;
 
     vmsvgaR3CmdBufCtxInit(&pSVGAState->CmdBufCtxDC);