Changeset 53232 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter

Timestamp:

Nov 5, 2014 11:23:32 AM (10 years ago)

Author:

vboxsync

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

96781

Message:

Host 3D: Chromium server: drop non-functional code.

Location:

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

Files:

• display_window.cpp (modified) (1 diff)
• server_presenter.h (modified) (3 diffs)
• window.cpp (modified) (2 diffs)

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

@@ -68 +68 @@
 
 
-int CrFbDisplayWindow::RegionsChanged(struct CR_FRAMEBUFFER *pFb)
-{
-    int rc = CrFbDisplayBase::RegionsChanged(pFb);
-    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;
-    }
-
-    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;
-    }
-
-    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;
-    }
-
-    return VINF_SUCCESS;
-}
-
-
 int CrFbDisplayWindow::FramebufferChanged(struct CR_FRAMEBUFFER *pFb)
 {

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);
@@ -226 +224 @@
         bool isPresentNeeded();
         bool checkInitedUpdating();
+        void Destroy();
 
     private:
@@ -261 +260 @@
         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

@@ -35 +35 @@
 
 
-bool CrFbWindow::IsCreated() const
-{
-    return !!mSpuWindow;
-}
-
-
 bool CrFbWindow::IsVisivle() const
 {
     return mFlags.fVisible;
-}
-
-
-void CrFbWindow::Destroy()
-{
-    CRASSERT(!mcUpdates);
-
-    if (!mSpuWindow)
-        return;
-
-    cr_server.head_spu->dispatch_table.WindowDestroy(mSpuWindow);
-
-    mSpuWindow = 0;
-    mFlags.fDataPresented = 0;
 }
 
@@ -351 +331 @@
 }
 
+
+void CrFbWindow::Destroy()
+{
+    CRASSERT(!mcUpdates);
+
+    if (!mSpuWindow)
+        return;
+
+    cr_server.head_spu->dispatch_table.WindowDestroy(mSpuWindow);
+
+    mSpuWindow = 0;
+    mFlags.fDataPresented = 0;
+}
+