Changeset 76376 in vbox for trunk/src/VBox

Timestamp:

Dec 22, 2018 10:32:24 PM (6 years ago)

Author:

vboxsync

Message:

VBoxUhgsmi.h: GCC doesn't like unnamed sub-structures in C++ code, so ditched them for VBOXUHGSMI_BUFFER_TYPE_FLAGS, VBOXUHGSMI_BUFFER_LOCK_FLAGS and VBOXUHGSMI_BUFFER_SUBMIT_FLAGS. Also skipped the outer wrapper structures for each of these types as all it contained was an unnamed union, so just make the typedefs unions straight away. Fixed some hungarian inconsistency between the three types ('b' == byte, not boolean in VBox, don't forget).

Location:

trunk/src/VBox

Files:

• Additions/WINNT/Graphics/Video/disp/wddm/VBoxUhgsmiBase.cpp (modified) (2 diffs)
• Additions/WINNT/Graphics/Video/disp/wddm/VBoxUhgsmiBase.h (modified) (3 diffs)
• Additions/WINNT/Graphics/Video/disp/wddm/VBoxUhgsmiKmt.cpp (modified) (1 diff)
• GuestHost/OpenGL/util/vboxhgcm.c (modified) (10 diffs)

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

@@ -48 +48 @@
     *phSynch = NULL;
 
-    if (fUhgsmiType.fCommand)
+    if (fUhgsmiType.s.fCommand)
     {
         *phSynch = CreateEvent(
@@ -186 +186 @@
         PVBOXUHGSMI_BUFFER_PRIVATE_ESC_BASE pBuf = VBOXUHGSMIESCBASE_GET_BUFFER(pBufInfo->pBuf);
         pSubmInfo->hAlloc = pBuf->Alloc.hAlloc;
-        if (pBufInfo->fFlags.bEntireBuffer)
+        if (pBufInfo->fFlags.s.fEntireBuffer)
         {
             pSubmInfo->Info.offData = 0;

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxUhgsmiBase.h

@@ -94 +94 @@
     D3DDDICB_LOCKFLAGS fLockFlags;
     fLockFlags.Value = 0;
-    if (fFlags.bLockEntire)
+    if (fFlags.s.fLockEntire)
     {
         Assert(!offLock);
@@ -126 +126 @@
     }
 
-    fLockFlags.ReadOnly = fFlags.bReadOnly;
-    fLockFlags.WriteOnly = fFlags.bWriteOnly;
-    fLockFlags.DonotWait = fFlags.bDonotWait;
-//    fLockFlags.Discard = fFlags.bDiscard;
+    fLockFlags.ReadOnly  = fFlags.s.fReadOnly;
+    fLockFlags.WriteOnly = fFlags.s.fWriteOnly;
+    fLockFlags.DonotWait = fFlags.s.fDonotWait;
+//    fLockFlags.Discard = fFlags.s.fDiscard;
     *pfFlags = fLockFlags;
     return VINF_SUCCESS;
@@ -173 +173 @@
         pAllocationList->hAllocation = pBuffer->hAllocation;
         pAllocationList->Value = 0;
-        pAllocationList->WriteOperation = !pBufInfo->fFlags.bHostReadOnly;
-        pAllocationList->DoNotRetireInstance = pBufInfo->fFlags.bDoNotRetire;
-        if (pBufInfo->fFlags.bEntireBuffer)
+        pAllocationList->WriteOperation = !pBufInfo->fFlags.s.fHostReadOnly;
+        pAllocationList->DoNotRetireInstance = pBufInfo->fFlags.s.fDoNotRetire;
+        if (pBufInfo->fFlags.s.fEntireBuffer)
         {
             pBufSubmInfo->offData = 0;

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

@@ -54 +54 @@
 }
 
-DECLCALLBACK(int) vboxUhgsmiKmtBufferLock(PVBOXUHGSMI_BUFFER pBuf, uint32_t offLock, uint32_t cbLock, VBOXUHGSMI_BUFFER_LOCK_FLAGS fFlags, void**pvLock)
+DECLCALLBACK(int) vboxUhgsmiKmtBufferLock(PVBOXUHGSMI_BUFFER pBuf, uint32_t offLock, uint32_t cbLock,
+                                          VBOXUHGSMI_BUFFER_LOCK_FLAGS fFlags, void**pvLock)
 {
     PVBOXUHGSMI_BUFFER_PRIVATE_DX_ALLOC_BASE pBuffer = VBOXUHGSMDXALLOCBASE_GET_BUFFER(pBuf);

trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c

@@ -241 +241 @@
     VBOXUHGSMI_BUFFER_TYPE_FLAGS Flags = {0};
     pClient->pHgsmi = pHgsmi;
-    Flags.fCommand = 1;
+    Flags.s.fCommand = 1;
     rc = pHgsmi->pfnBufferCreate(pHgsmi, CRVBOXHGSMI_PAGE_ALIGN(1), Flags, &pClient->pCmdBuffer);
     if (RT_SUCCESS(rc))
@@ -417 +417 @@
     int rc;
     fFlags.Value = 0;
-    fFlags.bDiscard = 1;
+    fFlags.s.fDiscard = 1;
     rc = pClient->pCmdBuffer->pfnLock(pClient->pCmdBuffer, 0, cbBuffer, fFlags, (void**)&pHdr);
     if (RT_SUCCESS(rc))
         return pHdr;
-    else
-        crWarning("_crVBoxHGSMICmdBufferLock: pfnLock failed rc %d", rc);
+    crWarning("_crVBoxHGSMICmdBufferLock: pfnLock failed rc %d", rc);
 
     crWarning("Failed to Lock the command buffer of size(%d), rc(%d)\n", cbBuffer, rc);
@@ -444 +443 @@
     int rc;
     fFlags.Value = 0;
-    fFlags.bReadOnly = 1;
+    fFlags.s.fReadOnly = 1;
     rc = pClient->pCmdBuffer->pfnLock(pClient->pCmdBuffer, 0, cbBuffer, fFlags, (void**)&pHdr);
     if (RT_FAILURE(rc))
@@ -465 +464 @@
 
     fFlags.Value = 0;
-    fFlags.bReadOnly = 1;
+    fFlags.s.fReadOnly = 1;
     rc = pClient->pCmdBuffer->pfnLock(pClient->pCmdBuffer, 0, sizeof (*pHdr), fFlags, (void**)&pHdr);
     if (RT_FAILURE(rc))
@@ -515 +514 @@
     pSubm->cbData = cbData;
     pSubm->fFlags.Value = 0;
-    pSubm->fFlags.bDoNotRetire = 1;
+    pSubm->fFlags.s.fDoNotRetire = 1;
 # if 0
     pSubm->fFlags.bDoNotSignalCompletion = 1; /* <- we do not need that actually since
@@ -1615 +1614 @@
     aSubmit[1].cbData = pRecvBuffer->cbBuffer;
     aSubmit[1].fFlags.Value = 0;
-    aSubmit[1].fFlags.bHostWriteOnly = 1;
+    aSubmit[1].fFlags.s.fHostWriteOnly = 1;
 
     rc = pClient->pHgsmi->pfnBufferSubmit(pClient->pHgsmi, aSubmit, 2);
@@ -1702 +1701 @@
         offBuffer = 0;
         fFlags.Value = 0;
-        fFlags.bDiscard = 1;
-        fFlags.bWriteOnly = 1;
+        fFlags.s.fDiscard = 1;
+        fFlags.s.fWriteOnly = 1;
         rc = pBuf->pfnLock(pBuf, 0, len, fFlags, &pvBuf);
         if (RT_SUCCESS(rc))
@@ -1740 +1739 @@
         aSubmit[1].cbData = len;
         aSubmit[1].fFlags.Value = 0;
-        aSubmit[1].fFlags.bHostReadOnly = 1;
+        aSubmit[1].fFlags.s.fHostReadOnly = 1;
 
         aSubmit[2].pBuf = pRecvBuffer;
@@ -1862 +1861 @@
         aSubmit[1].cbData = len;
         aSubmit[1].fFlags.Value = 0;
-        aSubmit[1].fFlags.bHostReadOnly = 1;
+        aSubmit[1].fFlags.s.fHostReadOnly = 1;
 
         rc = pClient->pHgsmi->pfnBufferSubmit(pClient->pHgsmi, aSubmit, 2);
@@ -1894 +1893 @@
         aSubmit[1].cbData = len;
         aSubmit[1].fFlags.Value = 0;
-        aSubmit[1].fFlags.bHostReadOnly = 1;
+        aSubmit[1].fFlags.s.fHostReadOnly = 1;
 
         rc = pClient->pHgsmi->pfnBufferSubmit(pClient->pHgsmi, aSubmit, 2);