Changeset 47566 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Aug 6, 2013 10:20:23 PM (11 years ago)

Author:

vboxsync

Message:

crOpenGL/wddm: TexPresent fixes, irq handling fix

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• include/cr_server.h (modified) (3 diffs)
• include/cr_version.h (modified) (1 diff)
• include/cr_vreg.h (modified) (1 diff)
• util/vreg.cpp (modified) (5 diffs)

trunk/src/VBox/GuestHost/OpenGL/include/cr_server.h

@@ -209 +209 @@
     VBOXVR_SCR_COMPOSITOR_ENTRY CEntry;
     VBOXVR_SCR_COMPOSITOR_ENTRY RootVrCEntry;
-    void *pvUserData1;
-    void *pvUserData2;
 } CR_DISPLAY_ENTRY, *PCR_DISPLAY_ENTRY;
 /**/
@@ -349 +347 @@
 /* DISPLAY */
 
+#define CR_DENTRY_FROM_CENTRY(_pCentry) ((CR_DISPLAY_ENTRY*)((uint8_t*)(_pCentry) - RT_OFFSETOF(CR_DISPLAY_ENTRY, CEntry)))
+
+
 /* @todo:
  * 1. use compositor stored inside mural to use current MuralFBO and window-related API
@@ -359 +360 @@
 } CR_DISPLAY, *PCR_DISPLAY;
 
-int CrDpInit(PCR_DISPLAY pDisplay);
-void CrDpTerm(PCR_DISPLAY pDisplay);
-void CrDpResize(PCR_DISPLAY pDisplay, int32_t xPos, int32_t yPos, uint32_t width, uint32_t height);
-void CrDpEntryInit(PCR_DISPLAY_ENTRY pEntry, const VBOXVR_TEXTURE *pTextureData, void *pvUserData);
-void CrDpEntryCleanup(PCR_DISPLAY pDisplay, PCR_DISPLAY_ENTRY pEntry);
-int CrDpEntryRegionsSet(PCR_DISPLAY pDisplay, PCR_DISPLAY_ENTRY pEntry, const RTPOINT *pPos, uint32_t cRegions, const RTRECT *paRegions);
-int CrDpEntryRegionsAdd(PCR_DISPLAY pDisplay, PCR_DISPLAY_ENTRY pEntry, const RTPOINT *pPos, uint32_t cRegions, const RTRECT *paRegions);
-void CrDpEntryRegionsClear(PCR_DISPLAY pDisplay);
-DECLINLINE(bool) CrDpEntryIsUsed(PCR_DISPLAY_ENTRY pEntry)
-{
-    return CrVrScrCompositorEntryIsInList(&pEntry->CEntry);
-}
-
-DECLINLINE(CRMuralInfo*) CrDpGetMural(PCR_DISPLAY pDisplay)
-{
-    return &pDisplay->Mural;
-}
 
 typedef struct CR_DISPLAY_ENTRY_MAP
 {
-    CRHashTable * pTextureMap;
+    CRHashTable * pTexIdToDemInfoMap;
 } CR_DISPLAY_ENTRY_MAP, *PCR_DISPLAY_ENTRY_MAP;
 
-int CrDemInit(PCR_DISPLAY_ENTRY_MAP pMap);
-void CrDemTerm(PCR_DISPLAY_ENTRY_MAP pMap);
-PCR_DISPLAY_ENTRY CrDemEntryAcquire(PCR_DISPLAY_ENTRY_MAP pMap, GLuint idTexture);
-void CrDemEntryRelease(PCR_DISPLAY_ENTRY pEntry);
-//void CrDemEntryDestroy(PCR_DISPLAY_ENTRY_MAP pMap, GLuint idTexture);
 
 /* */

trunk/src/VBox/GuestHost/OpenGL/include/cr_version.h

@@ -37 +37 @@
 /* dummy windows and contexts have 0 external IDs, so never get stored to the state */
 #define SHCROGL_SSM_VERSION_WITH_FIXED_DUMMYIDS                     39
-#define SHCROGL_SSM_VERSION                                         39
+#define SHCROGL_SSM_VERSION_WITH_SCREEN_INFO                        40
+#define SHCROGL_SSM_VERSION                                         40
 
 /* These define the Chromium release number.

trunk/src/VBox/GuestHost/OpenGL/include/cr_vreg.h

@@ -400 +400 @@
 VBOXVREGDECL(int) CrVrScrCompositorEntryRemove(PVBOXVR_SCR_COMPOSITOR pCompositor, PVBOXVR_SCR_COMPOSITOR_ENTRY pEntry);
 VBOXVREGDECL(void) CrVrScrCompositorEntryFlagsSet(PVBOXVR_SCR_COMPOSITOR_ENTRY pEntry, uint32_t fFlags);
-VBOXVREGDECL(uint32_t) CrVrScrCompositorEntryFlagsGet(PVBOXVR_SCR_COMPOSITOR pCompositor, PVBOXVR_SCR_COMPOSITOR_ENTRY pEntry);
+VBOXVREGDECL(uint32_t) CrVrScrCompositorEntryFlagsCombinedGet(PVBOXVR_SCR_COMPOSITOR pCompositor, PVBOXVR_SCR_COMPOSITOR_ENTRY pEntry);
+DECLINLINE(uint32_t) CrVrScrCompositorEntryFlagsGet(PVBOXVR_SCR_COMPOSITOR_ENTRY pEntry)
+{
+    return pEntry->fFlags;
+}
+
 VBOXVREGDECL(void) CrVrScrCompositorInit(PVBOXVR_SCR_COMPOSITOR pCompositor);
 VBOXVREGDECL(void) CrVrScrCompositorClear(PVBOXVR_SCR_COMPOSITOR pCompositor);

trunk/src/VBox/GuestHost/OpenGL/util/vreg.cpp

@@ -1749 +1749 @@
     Assert(cRects);
     Assert(cRects <= pData->cRects);
-    int rc = VBoxVrListRectsGet(&pCEntry->Vr, cRects, pEntry->paDstRects);
+    int rc = VBoxVrListRectsGet(&pCEntry->Vr, cRects, pEntry->paDstUnstretchedRects);
     AssertRC(rc);
 
-    memcpy(pEntry->paDstUnstretchedRects, pEntry->paDstRects, cRects * sizeof (*pEntry->paDstUnstretchedRects));
-
     if (!pEntry->Pos.x && !pEntry->Pos.y)
     {
-        memcpy(pEntry->paSrcRects, pEntry->paDstRects, cRects * sizeof (*pEntry->paSrcRects));
+        memcpy(pEntry->paSrcRects, pEntry->paDstUnstretchedRects, cRects * sizeof (*pEntry->paSrcRects));
     }
     else
@@ -1762 +1760 @@
         for (uint32_t i = 0; i < cRects; ++i)
         {
-            pEntry->paSrcRects[i].xLeft = (int32_t)((pEntry->paDstRects[i].xLeft - pEntry->Pos.x));
-            pEntry->paSrcRects[i].yTop = (int32_t)((pEntry->paDstRects[i].yTop - pEntry->Pos.y));
-            pEntry->paSrcRects[i].xRight = (int32_t)((pEntry->paDstRects[i].xRight - pEntry->Pos.x));
-            pEntry->paSrcRects[i].yBottom = (int32_t)((pEntry->paDstRects[i].yBottom - pEntry->Pos.y));
+            pEntry->paSrcRects[i].xLeft = (int32_t)((pEntry->paDstUnstretchedRects[i].xLeft - pEntry->Pos.x));
+            pEntry->paSrcRects[i].yTop = (int32_t)((pEntry->paDstUnstretchedRects[i].yTop - pEntry->Pos.y));
+            pEntry->paSrcRects[i].xRight = (int32_t)((pEntry->paDstUnstretchedRects[i].xRight - pEntry->Pos.x));
+            pEntry->paSrcRects[i].yBottom = (int32_t)((pEntry->paDstUnstretchedRects[i].yBottom - pEntry->Pos.y));
         }
     }
@@ -1776 +1774 @@
             if (pCompositor->StretchX != 1.)
             {
-                pEntry->paDstRects[i].xLeft = (int32_t)(pEntry->paDstRects[i].xLeft * pCompositor->StretchX);
-                pEntry->paDstRects[i].xRight = (int32_t)(pEntry->paDstRects[i].xRight * pCompositor->StretchX);
+                pEntry->paDstRects[i].xLeft = (int32_t)(pEntry->paDstUnstretchedRects[i].xLeft * pCompositor->StretchX);
+                pEntry->paDstRects[i].xRight = (int32_t)(pEntry->paDstUnstretchedRects[i].xRight * pCompositor->StretchX);
             }
             if (pCompositor->StretchY != 1.)
             {
-                pEntry->paDstRects[i].yTop = (int32_t)(pEntry->paDstRects[i].yTop * pCompositor->StretchY);
-                pEntry->paDstRects[i].yBottom = (int32_t)(pEntry->paDstRects[i].yBottom * pCompositor->StretchY);
-            }
-        }
-    }
-
+                pEntry->paDstRects[i].yTop = (int32_t)(pEntry->paDstUnstretchedRects[i].yTop * pCompositor->StretchY);
+                pEntry->paDstRects[i].yBottom = (int32_t)(pEntry->paDstUnstretchedRects[i].yBottom * pCompositor->StretchY);
+            }
+        }
+    }
+    else
+#endif
+    {
+        memcpy(pEntry->paDstRects, pEntry->paDstUnstretchedRects, cRects * sizeof (*pEntry->paDstUnstretchedRects));
+    }
+
+#if 0//ndef IN_RING0
     bool canZeroX = (pCompositor->StretchX < 1.);
     bool canZeroY = (pCompositor->StretchY < 1.);
@@ -1795 +1799 @@
         for (iOrig = 0, iNew = 0; iOrig < cRects; ++iOrig)
         {
-            PRTRECT pOrigRect = &pEntry->paSrcRects[iOrig];
-            if (pOrigRect->xLeft == pOrigRect->xRight
-                    || pOrigRect->yTop == pOrigRect->yBottom)
+            PRTRECT pOrigRect = &pEntry->paDstRects[iOrig];
+            if (pOrigRect->xLeft != pOrigRect->xRight
+                    && pOrigRect->yTop != pOrigRect->yBottom)
                 continue;
 
@@ -2294 +2298 @@
 }
 
-VBOXVREGDECL(uint32_t) CrVrScrCompositorEntryFlagsGet(PVBOXVR_SCR_COMPOSITOR pCompositor, PVBOXVR_SCR_COMPOSITOR_ENTRY pEntry)
+VBOXVREGDECL(uint32_t) CrVrScrCompositorEntryFlagsCombinedGet(PVBOXVR_SCR_COMPOSITOR pCompositor, PVBOXVR_SCR_COMPOSITOR_ENTRY pEntry)
 {
     return CRBLT_FOP_COMBINE(pCompositor->fFlags, pEntry->fFlags);