Changeset 50149 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Jan 21, 2014 6:18:36 PM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: bugfixes

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserver/crservice.cpp (modified) (2 diffs)
• crserverlib/server_muralfbo.cpp (modified) (2 diffs)
• crserverlib/server_presenter.cpp (modified) (22 diffs)

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

@@ -1188 +1188 @@
             for (int i = 0; i < SHCRGL_CPARMS_DEV_RESIZE; ++i)
             {
-                if (paParms[i].type != VBOX_HGCM_SVC_PARM_PTR
-                        || !paParms[i].u.pointer.addr)
+                if (paParms[i].type != VBOX_HGCM_SVC_PARM_32BIT)
                 {
                     AssertMsgFailed(("invalid param\n"));
@@ -1196 +1195 @@
             }
 
-            rc = crVBoxServerNotifyResize((const VBVAINFOSCREEN *)paParms[0].u.pointer.addr, paParms[1].u.pointer.addr);
+            rc = crVBoxServerNotifyResize(paParms[0].u.uint32);
             break;
         }

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

@@ -395 +395 @@
 }
 
-DECLEXPORT(int) crVBoxServerNotifyResize(const struct VBVAINFOSCREEN *pScreen, void *pvVRAM)
+
+static int crVBoxServerResizeScreen(const struct VBVAINFOSCREEN *pScreen, void *pvVRAM)
 {
     int rc;
@@ -427 +428 @@
 
     return rc;
+}
+
+DECLEXPORT(int) crVBoxServerNotifyResize(uint32_t idScreen)
+{
+    struct VBVAINFOSCREEN Screen;
+    void *pvVRAM;
+
+    int rc = cr_server.CltInfo.pfnDmGet(cr_server.CltInfo.hClient, idScreen, &Screen, &pvVRAM);
+    if (!RT_SUCCESS(rc))
+    {
+        WARN(("err"));
+        return rc;
+    }
+
+    rc = crVBoxServerResizeScreen(&Screen, pvVRAM);
+    if (!RT_SUCCESS(rc))
+    {
+        WARN(("err"));
+        return rc;
+    }
+
+    return VINF_SUCCESS;
 }
 

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

@@ -670 +670 @@
             Assert(!pReplacedScrEntry);
         }
+
+        if (hEntry)
+        {
+            if (CrVrScrCompositorEntryIsUsed(&hEntry->Entry))
+            {
+                if (pFb->pDisplay)
+                    pFb->pDisplay->EntryTexChanged(pFb, hEntry);
+            }
+        }
     }
     else
@@ -727 +736 @@
                 pFb->pDisplay->RegionsChanged(pFb);
         }
+
+        if (hEntry)
+        {
+            if (CrVrScrCompositorEntryIsUsed(&hEntry->Entry))
+            {
+                if (pFb->pDisplay)
+                    pFb->pDisplay->EntryTexChanged(pFb, hEntry);
+            }
+        }
     }
     else
@@ -763 +781 @@
     return CrHTableGet(&hEntry->HTable, hSlot);
 }
+
+typedef union CR_FBDISPBASE_FLAGS
+{
+    struct {
+        uint32_t fRegionsShanged : 1;
+        uint32_t Reserved        : 31;
+    };
+    uint32_t u32Value;
+} CR_FBDISPBASE_FLAGS;
 
 class CrFbDisplayBase : public ICrFbDisplay
@@ -772 +799 @@
         mcUpdates(0),
         mhSlot(CRHTABLE_HANDLE_INVALID)
-    {}
+    {
+        mFlags.u32Value = 0;
+    }
 
     virtual bool isComposite()
@@ -792 +821 @@
     {
         return !!mcUpdates;
+    }
+
+    int setRegionsChanged()
+    {
+        if (!mcUpdates)
+        {
+            WARN(("err"));
+            return VERR_INVALID_STATE;
+        }
+
+        mFlags.fRegionsShanged = 1;
+        return VINF_SUCCESS;
     }
 
@@ -848 +889 @@
     {
         ++mcUpdates;
+        Assert(!mFlags.fRegionsShanged || mcUpdates > 1);
         return VINF_SUCCESS;
     }
@@ -855 +897 @@
         --mcUpdates;
         Assert(mcUpdates < UINT32_MAX/2);
+        if (!mcUpdates)
+            onUpdateEnd();
     }
 
@@ -874 +918 @@
             return VERR_INVALID_STATE;
         }
+        mFlags.fRegionsShanged = 1;
         return VINF_SUCCESS;
     }
@@ -904 +949 @@
             return VERR_INVALID_STATE;
         }
+        mFlags.fRegionsShanged = 1;
         return VINF_SUCCESS;
     }
@@ -919 +965 @@
             return VERR_INVALID_STATE;
         }
+        mFlags.fRegionsShanged = 1;
         return VINF_SUCCESS;
     }
@@ -929 +976 @@
             return VERR_INVALID_STATE;
         }
+        mFlags.fRegionsShanged = 1;
         return VINF_SUCCESS;
     }
@@ -948 +996 @@
     class CrFbDisplayComposite* mpContainer;
 protected:
+    virtual void onUpdateEnd()
+    {
+        if (mFlags.fRegionsShanged)
+        {
+            mFlags.fRegionsShanged = 0;
+            ueRegions();
+        }
+    }
+
+    virtual void ueRegions()
+    {
+    }
+
     int fbSynchAddAllEntries()
     {
@@ -1052 +1113 @@
     uint32_t mcUpdates;
     CRHTABLE_HANDLE mhSlot;
+    CR_FBDISPBASE_FLAGS mFlags;
 };
 
@@ -1687 +1749 @@
     virtual int UpdateBegin(struct CR_FRAMEBUFFER *pFb)
     {
-        int rc = CrFbDisplayBase::UpdateBegin(pFb);
-        if (!RT_SUCCESS(rc))
-        {
-            WARN(("err"));
-            return rc;
-        }
-
-        return mpWindow->UpdateBegin();
+        int rc = mpWindow->UpdateBegin();
+        if (RT_SUCCESS(rc))
+        {
+            rc = CrFbDisplayBase::UpdateBegin(pFb);
+            if (RT_SUCCESS(rc))
+                return VINF_SUCCESS;
+            else
+                WARN(("err"));
+        }
+        else
+            WARN(("err"));
+
+        return rc;
     }
 
     virtual void UpdateEnd(struct CR_FRAMEBUFFER *pFb)
     {
+        CrFbDisplayBase::UpdateEnd(pFb);
+
         mpWindow->UpdateEnd();
-
-        CrFbDisplayBase::UpdateEnd(pFb);
     }
 
@@ -1768 +1835 @@
 
         return VINF_SUCCESS;
-    }
-
-    virtual int EntryRemoved(struct CR_FRAMEBUFFER *pFb, HCR_FRAMEBUFFER_ENTRY hEntry)
-    {
-        int rc = CrFbDisplayBase::EntryRemoved(pFb, hEntry);
-        if (!RT_SUCCESS(rc))
-        {
-            WARN(("err"));
-            return rc;
-        }
-
-        return mpWindow->SetVisibleRegionsChanged();
-    }
-
-    virtual int EntryPosChanged(struct CR_FRAMEBUFFER *pFb, HCR_FRAMEBUFFER_ENTRY hEntry)
-    {
-        int rc = CrFbDisplayBase::EntryPosChanged(pFb, hEntry);
-        if (!RT_SUCCESS(rc))
-        {
-            WARN(("err"));
-            return rc;
-        }
-
-        return mpWindow->SetVisibleRegionsChanged();
-    }
-
-    virtual int RegionsChanged(struct CR_FRAMEBUFFER *pFb)
-    {
-        int rc = CrFbDisplayBase::RegionsChanged(pFb);
-        if (!RT_SUCCESS(rc))
-        {
-            WARN(("err"));
-            return rc;
-        }
-
-        return mpWindow->SetVisibleRegionsChanged();
     }
 
@@ -1894 +1925 @@
 
 protected:
+    virtual void ueRegions()
+    {
+        mpWindow->SetVisibleRegionsChanged();
+    }
+
     virtual int screenChanged()
     {
@@ -1910 +1946 @@
         }
 
-        mpWindow->SetVisibleRegionsChanged();
+        setRegionsChanged();
 
         return mpWindow->SetSize((uint32_t)(pRect->xRight - pRect->xLeft), (uint32_t)(pRect->yBottom - pRect->yTop));
@@ -2122 +2158 @@
         }
 
+        VBOXVR_SCR_COMPOSITOR_ENTRY *pMyEntry = (VBOXVR_SCR_COMPOSITOR_ENTRY*)CrFbDDataEntryGet(hEntry, slotGet());
+        rc = CrVrScrCompositorEntryRegionsSet(&mCompositor, pMyEntry, NULL, 0, NULL, false, NULL);
+        if (!RT_SUCCESS(rc))
+        {
+            WARN(("err"));
+            return rc;
+        }
+
         return VINF_SUCCESS;
     }
@@ -2142 +2186 @@
     }
 
-    virtual int RegionsChanged(struct CR_FRAMEBUFFER *pFb)
-    {
-        int rc = CrFbDisplayWindow::RegionsChanged(pFb);
-        if (!RT_SUCCESS(rc))
-        {
-            WARN(("err"));
-            return rc;
-        }
-
-        rc = synchCompositorRegions();
-        if (!RT_SUCCESS(rc))
-        {
-            WARN(("err"));
-            return rc;
-        }
-
-        return VINF_SUCCESS;
-    }
-
     virtual int setViewportRect(const RTRECT *pViewportRect)
     {
@@ -2181 +2206 @@
 
 protected:
+    virtual void ueRegions()
+    {
+        synchCompositorRegions();
+    }
+
     virtual int screenChanged()
     {
@@ -2198 +2228 @@
 
         return VINF_SUCCESS;
+    }
+
+    virtual const struct VBOXVR_SCR_COMPOSITOR* getCompositor()
+    {
+        return &mCompositor;
     }
 
@@ -2630 +2665 @@
                         vrdpGeometry(hEntry);
                         vrdpRegions(hFb, hEntry);
-                        vrdpFrame(hEntry);
+                        //vrdpFrame(hEntry);
                         return VINF_SUCCESS;
                     }