Changeset 53262 in vbox for trunk/src

Timestamp:

Nov 7, 2014 1:06:25 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

96829

Message:

Revert r96781, r96707 and r96693 since these commits affect 3D overlay window badly on Windows host.

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter

Files:

• display_window.cpp (modified) (4 diffs)
• server_presenter.h (modified) (3 diffs)
• window.cpp (modified) (6 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/display_window.cpp

@@ -25 +25 @@
     mParentId(parentId)
 {
-    crDebug("CrFbDisplayWindow: created with parentID %p.", parentId);
     mFlags.u32Value = 0;
 }
@@ -65 +64 @@
     if (mpWindow)
         mpWindow->UpdateEnd();
+}
+
+
+int CrFbDisplayWindow::RegionsChanged(struct CR_FRAMEBUFFER *pFb)
+{
+    int rc = CrFbDisplayBase::RegionsChanged(pFb);
+    if (!RT_SUCCESS(rc))
+    {
+        WARN(("err"));
+        return rc;
+    }
+
+    if (mpWindow && mpWindow->GetParentId())
+    {
+        rc = mpWindow->Create();
+        if (!RT_SUCCESS(rc))
+        {
+            WARN(("err"));
+            return rc;
+        }
+    }
+
+    return VINF_SUCCESS;
+}
+
+
+int CrFbDisplayWindow::EntryCreated(struct CR_FRAMEBUFFER *pFb, HCR_FRAMEBUFFER_ENTRY hEntry)
+{
+    int rc = CrFbDisplayBase::EntryCreated(pFb, hEntry);
+    if (!RT_SUCCESS(rc))
+    {
+        WARN(("err"));
+        return rc;
+    }
+
+    if (mpWindow && mpWindow->GetParentId())
+    {
+        rc = mpWindow->Create();
+        if (!RT_SUCCESS(rc))
+        {
+            WARN(("err"));
+            return rc;
+        }
+    }
+
+    return VINF_SUCCESS;
+}
+
+
+int CrFbDisplayWindow::EntryReplaced(struct CR_FRAMEBUFFER *pFb, HCR_FRAMEBUFFER_ENTRY hNewEntry, HCR_FRAMEBUFFER_ENTRY hReplacedEntry)
+{
+    int rc = CrFbDisplayBase::EntryReplaced(pFb, hNewEntry, hReplacedEntry);
+    if (!RT_SUCCESS(rc))
+    {
+        WARN(("err"));
+        return rc;
+    }
+
+    if (mpWindow && mpWindow->GetParentId())
+    {
+        rc = mpWindow->Create();
+        if (!RT_SUCCESS(rc))
+        {
+            WARN(("err"));
+            return rc;
+        }
+    }
+
+    return VINF_SUCCESS;
+}
+
+
+int CrFbDisplayWindow::EntryTexChanged(struct CR_FRAMEBUFFER *pFb, HCR_FRAMEBUFFER_ENTRY hEntry)
+{
+    int rc = CrFbDisplayBase::EntryTexChanged(pFb, hEntry);
+    if (!RT_SUCCESS(rc))
+    {
+        WARN(("err"));
+        return rc;
+    }
+
+    if (mpWindow && mpWindow->GetParentId())
+    {
+        rc = mpWindow->Create();
+        if (!RT_SUCCESS(rc))
+        {
+            WARN(("err"));
+            return rc;
+        }
+    }
+
+    return VINF_SUCCESS;
 }
 
@@ -334 +425 @@
 {
     int rc = VINF_SUCCESS;
-
-    crDebug("CrFbDisplayWindow: sync window dimentions: fForceCleanup=%s, mpWindow=%p, isActive()=%s",
-        fForceCleanup ? "yes" : "no",
-        mpWindow,
-        isActive() ? "yes" : "no");
 
     if (!mpWindow)
@@ -457 +543 @@
     }
 
+    if (CrFbHas3DData(hFb))
+    {
+        if (mpWindow && mpWindow->GetParentId())
+        {
+            rc = mpWindow->Create();
+            if (!RT_SUCCESS(rc))
+            {
+                WARN(("err"));
+                return rc;
+            }
+        }
+    }
+
     return VINF_SUCCESS;
 }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/server_presenter.h

@@ -206 +206 @@
 
         CrFbWindow(uint64_t parentId);
+        bool IsCreated() const;
         bool IsVisivle() const;
+        void Destroy();
         int Reparent(uint64_t parentId);
         int SetVisible(bool fVisible);
@@ -216 +218 @@
         void UpdateEnd();
         uint64_t GetParentId();
+        int Create();
         ~CrFbWindow();
 
     protected:
 
-        int Create();
         void checkRegions();
         bool isPresentNeeded();
         bool checkInitedUpdating();
-        void Destroy();
 
     private:
@@ -260 +261 @@
         virtual int UpdateBegin(struct CR_FRAMEBUFFER *pFb);
         virtual void UpdateEnd(struct CR_FRAMEBUFFER *pFb);
+        virtual int RegionsChanged(struct CR_FRAMEBUFFER *pFb);
+        virtual int EntryCreated(struct CR_FRAMEBUFFER *pFb, HCR_FRAMEBUFFER_ENTRY hEntry);
+        virtual int EntryReplaced(struct CR_FRAMEBUFFER *pFb, HCR_FRAMEBUFFER_ENTRY hNewEntry, HCR_FRAMEBUFFER_ENTRY hReplacedEntry);
+        virtual int EntryTexChanged(struct CR_FRAMEBUFFER *pFb, HCR_FRAMEBUFFER_ENTRY hEntry);
         virtual int FramebufferChanged(struct CR_FRAMEBUFFER *pFb);
         const RTRECT* getViewportRect();

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/window.cpp

@@ -31 +31 @@
 {
     mFlags.Value = 0;
-    Create();
-}
-
+}
+
+
+bool CrFbWindow::IsCreated() const
+{
+    return !!mSpuWindow;
+}
 
 bool CrFbWindow::IsVisivle() const
@@ -41 +45 @@
 
 
+void CrFbWindow::Destroy()
+{
+    CRASSERT(!mcUpdates);
+
+    if (!mSpuWindow)
+        return;
+
+    cr_server.head_spu->dispatch_table.WindowDestroy(mSpuWindow);
+
+    mSpuWindow = 0;
+    mFlags.fDataPresented = 0;
+}
+
+
 int CrFbWindow::Reparent(uint64_t parentId)
 {
+    if (!checkInitedUpdating())
+    {
+        WARN(("err"));
+        return VERR_INVALID_STATE;
+    }
+
     crDebug("CrFbWindow: reparent to %p (current mxPos=%d, myPos=%d, mWidth=%u, mHeight=%u)",
         parentId, mxPos, myPos, mWidth, mHeight);
 
-    if (!checkInitedUpdating())
-    {
-        WARN(("err"));
-        return VERR_INVALID_STATE;
-    }
-
     uint64_t oldParentId = mParentId;
 
@@ -63 +81 @@
         renderspuSetWindowId(mParentId);
         renderspuReparentWindow(mSpuWindow);
+        renderspuSetWindowId(cr_server.screen[0].winID);
 
         if (parentId)
@@ -248 +267 @@
     if (mSpuWindow)
     {
-        WARN(("window already created"));
+        //WARN(("window already created"));
         return VINF_ALREADY_INITIALIZED;
     }
@@ -269 +288 @@
         cr_server.head_spu->dispatch_table.WindowShow(mSpuWindow, true);
 
-    crDebug("CrFbWindow: create window with parent %p (mxPos=%d, myPos=%d, mWidth=%u, mHeight=%u)",
-        mParentId, mxPos, myPos, mWidth, mHeight);
-
     return VINF_SUCCESS;
 }
@@ -331 +347 @@
 }
 
-
-void CrFbWindow::Destroy()
-{
-    CRASSERT(!mcUpdates);
-
-    if (!mSpuWindow)
-        return;
-
-    cr_server.head_spu->dispatch_table.WindowDestroy(mSpuWindow);
-
-    mSpuWindow = 0;
-    mFlags.fDataPresented = 0;
-}
-