Changeset 50913 in vbox for trunk/src/VBox/HostServices

Timestamp:

Mar 27, 2014 5:56:50 PM (11 years ago)

Author:

vboxsync

Message:

wddm/graphics: new command submission working for 2D, more testing needed

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserver/crservice.cpp (modified) (2 diffs)
• crserverlib/server.h (modified) (1 diff)
• crserverlib/server_main.c (modified) (9 diffs)
• crserverlib/server_presenter.cpp (modified) (1 diff)

trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp

@@ -1524 +1524 @@
                 case VBOXCRCMDCTL_TYPE_DISABLE:
                 {
-                    if (paParms->u.pointer.size != sizeof (VBOXCRCMDCTL))
+                    if (paParms->u.pointer.size != sizeof (VBOXCRCMDCTL_DISABLE))
                         WARN(("invalid param size"));
-                    int rc = crVBoxServerHgcmDisable();
+                    VBOXCRCMDCTL_DISABLE *pDisable = (VBOXCRCMDCTL_DISABLE*)pCtl;
+                    int rc = crVBoxServerHgcmDisable(&pDisable->Data);
                     if (RT_SUCCESS(rc))
                         g_u32fCrHgcmDisabled = 1;
@@ -1538 +1539 @@
                         WARN(("invalid param size"));
                     VBOXCRCMDCTL_ENABLE *pEnable = (VBOXCRCMDCTL_ENABLE*)pCtl;
-                    int rc = crVBoxServerHgcmEnable(pEnable->hRHCmd, pEnable->pfnRHCmd);
+                    int rc = crVBoxServerHgcmEnable(&pEnable->Data);
                     if (RT_SUCCESS(rc))
                         g_u32fCrHgcmDisabled = 0;

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server.h

@@ -51 +51 @@
 
 #define VBOXCRHGSMI_CMD_CHECK_COMPLETE(_pData, _rc) do { \
-        if (CRVBOXHGSMI_CMDDATA_IS_SET(_pData)) { \
+        if (CRVBOXHGSMI_CMDDATA_IS_HGSMICMD(_pData)) { \
             VBOXCRHGSMI_CMD_COMPLETE(_pData, _rc); \
         } \

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

@@ -84 +84 @@
 {
     CRClient *pClient = NULL;
-    int32_t i;
 
     pClient = crVBoxServerClientById(u32ClientID);
@@ -158 +157 @@
 
     tearingdown = 1;
+
+    if (cr_server.DisableData.hNotifyTerm)
+    {
+        VBOXCRCMDCTL_HGCMENABLE_DATA EnableData;
+        int rc = cr_server.DisableData.pfnNotifyTerm(cr_server.DisableData.hNotifyTerm, &EnableData);
+        if (!RT_SUCCESS(rc))
+        {
+            WARN(("pfnNotifyTerm failed %d", rc));
+            return;
+        }
+
+        rc = crVBoxServerHgcmEnable(&EnableData);
+        if (!RT_SUCCESS(rc))
+        {
+            WARN(("crVBoxServerHgcmEnable failed %d", rc));
+            return;
+        }
+
+        cr_server.DisableData.pfnNotifyTermDone(cr_server.DisableData.hNotifyTerm);
+    }
 
     crStateSetCurrent( NULL );
@@ -2975 +2994 @@
         {
             spuCtx = cr_server.MainContextInfo.SpuContext;
-            spuWindow = pMural->CreateInfo.realVisualBits;
+            spuWindow = pMural->spuWindow;
         }
     }
@@ -3014 +3033 @@
     cParams = cBuffers-1;
 
-    if (cbCmd != RT_OFFSETOF(VBOXCMDVBVA_CRCMD_CMD, aBuffers[cBuffers]))
+    if (cbCmd < RT_OFFSETOF(VBOXCMDVBVA_CRCMD_CMD, aBuffers[cBuffers]))
     {
         WARN(("invalid buffer size"));
@@ -3363 +3382 @@
                     rc = CrHTablePutToSlot(&cr_server.clientTable, u32ClientId, pClient);
                     if (RT_SUCCESS(rc))
+                    {
+                        pConnect->Hdr.u32CmdClientId = u32ClientId;
                         return VINF_SUCCESS;
+                    }
                     else
                         WARN(("CrHTablePutToSlot failed %d", rc));
@@ -3454 +3476 @@
 static DECLCALLBACK(int8_t) crVBoxCrCmdCmd(HVBOXCRCMDSVR hSvr, const VBOXCMDVBVA_HDR *pCmd, uint32_t cbCmd)
 {
-    AssertFailed();
     switch (pCmd->u8OpCode)
     {
@@ -3884 +3905 @@
 }
 
-int32_t crVBoxServerHgcmEnable(HVBOXCRCMDCTL_REMAINING_HOST_COMMAND hRHCmd, PFNVBOXCRCMDCTL_REMAINING_HOST_COMMAND pfnRHCmd)
+int32_t crVBoxServerHgcmEnable(VBOXCRCMDCTL_HGCMENABLE_DATA *pData)
 {
     int rc = VINF_SUCCESS;
     uint8_t* pCtl;
     uint32_t cbCtl;
+    HVBOXCRCMDCTL_REMAINING_HOST_COMMAND hRHCmd = pData->hRHCmd;
+    PFNVBOXCRCMDCTL_REMAINING_HOST_COMMAND pfnRHCmd = pData->pfnRHCmd;
 
     Assert(!cr_server.fCrCmdEnabled);
@@ -3908 +3931 @@
 }
 
-int32_t crVBoxServerHgcmDisable()
+int32_t crVBoxServerHgcmDisable(VBOXCRCMDCTL_HGCMDISABLE_DATA *pData)
 {
     Assert(!cr_server.fCrCmdEnabled);
@@ -3920 +3943 @@
     cr_server.head_spu->dispatch_table.MakeCurrent(0, 0, 0);
 
+    cr_server.DisableData = *pData;
+
     return VINF_SUCCESS;
 }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp

@@ -372 +372 @@
                         pCopyRect->yBottom - pCopyRect->yTop,
                         pu8Src,
-                        fSrcInvert ? -pSrc->pitch : pSrc->pitch,
+                        fSrcInvert ? -((GLint)pSrc->pitch) : pSrc->pitch,
                         UnscaledSrcWidth,
                         UnscaledSrcHeight