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

Timestamp:

Apr 23, 2014 11:39:21 AM (11 years ago)

Author:

vboxsync

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

93425

Message:

extend PDMIDISPLAYCONNECTOR::pfnVBVAXxx and VBVA resize for better DevVGA/CrCmd integration

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server.h (modified) (1 diff)
• server_main.c (modified) (2 diffs)
• server_muralfbo.cpp (modified) (2 diffs)
• server_presenter.cpp (modified) (1 diff)

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

@@ -473 +473 @@
 int8_t crVBoxServerCrCmdFlipProcess(const VBOXCMDVBVA_FLIP *pFlip);
 
+int crVBoxServerResizeScreen(const struct VBVAINFOSCREEN *pScreen, void *pvVRAM);
+
 //#define VBOX_WITH_CRSERVER_DUMPER
 #ifdef VBOX_WITH_CRSERVER_DUMPER

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

@@ -3569 +3569 @@
 }
 
+static DECLCALLBACK(int) crVBoxCrCmdResize(HVBOXCRCMDSVR hSvr, const struct VBVAINFOSCREEN *pScreen, void *pvVRAM)
+{
+    CRASSERT(cr_server.fCrCmdEnabled);
+    return crVBoxServerResizeScreen(pScreen, pvVRAM);
+}
+
 static const char* gszVBoxOGLSSMMagic = "***OpenGL state data***";
 
@@ -4195 +4201 @@
             pSetup->CrCmdServerInfo.pfnHostCtl = crVBoxCrCmdHostCtl;
             pSetup->CrCmdServerInfo.pfnGuestCtl = crVBoxCrCmdGuestCtl;
+            pSetup->CrCmdServerInfo.pfnResize = crVBoxCrCmdResize;
             pSetup->CrCmdServerInfo.pfnSaveState = crVBoxCrCmdSaveState;
             pSetup->CrCmdServerInfo.pfnLoadState = crVBoxCrCmdLoadState;

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

@@ -395 +395 @@
 
 
-static int crVBoxServerResizeScreen(const struct VBVAINFOSCREEN *pScreen, void *pvVRAM)
+int crVBoxServerResizeScreen(const struct VBVAINFOSCREEN *pScreen, void *pvVRAM)
 {
     int rc;
@@ -431 +431 @@
 DECLEXPORT(int) crVBoxServerNotifyResize(const struct VBVAINFOSCREEN *pScreen, void *pvVRAM)
 {
+    if (cr_server.fCrCmdEnabled)
+    {
+        WARN(("crVBoxServerNotifyResize for enabled CrCmd"));
+        return VERR_INVALID_STATE;
+    }
+
     int rc = crVBoxServerResizeScreen(pScreen, pvVRAM);
     if (!RT_SUCCESS(rc))

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

@@ -1242 +1242 @@
     return pFbTex;
 }
-
 
 CR_TEXDATA* CrFbTexDataCreate(const VBOXVR_TEXTURE *pTex)