Changeset 56922 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

Timestamp:

Jul 13, 2015 10:23:52 AM (10 years ago)

Author:

vboxsync

Message:

3D: Display List: Expando SPU and DLM module code significantly reworked (diff unreadable); first revision when glxgears can be saved and successfully restored; more testing and debugging needed; prelimenary tested ane enabled for Mac hosts only.

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c (modified) (3 diffs)

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

@@ -1683 +1683 @@
     }
 
+    rc = crServerPendSaveState(pSSM);
+    AssertRCReturn(rc, rc);
+
+    rc = CrPMgrSaveState(pSSM);
+    AssertRCReturn(rc, rc);
+
 #ifdef VBOX_WITH_CR_DISPLAY_LISTS
     if (cr_server.head_spu->dispatch_table.spu_save_state)
     {
-        rc = cr_server.head_spu->dispatch_table.spu_save_state("NULL");
+        rc = cr_server.head_spu->dispatch_table.spu_save_state((void *)pSSM);
         AssertRCReturn(rc, rc);
     }
@@ -1692 +1698 @@
         crDebug("Do not save %s SPU state: no interface exported.", cr_server.head_spu->name);
 #endif
-
-    rc = crServerPendSaveState(pSSM);
-    AssertRCReturn(rc, rc);
-
-    rc = CrPMgrSaveState(pSSM);
-    AssertRCReturn(rc, rc);
 
     /* all context gl error states should have now be synced with chromium erro states,
@@ -2481 +2481 @@
     }
 
+#ifdef VBOX_WITH_CR_DISPLAY_LISTS
+    if (version >= SHCROGL_SSM_VERSION_WITH_DISPLAY_LISTS)
+    {
+        if (cr_server.head_spu->dispatch_table.spu_load_state)
+        {
+            rc = cr_server.head_spu->dispatch_table.spu_load_state((void *)pSSM);
+            AssertRCReturn(rc, rc);
+        }
+        else
+            crDebug("Do not load %s SPU state: no interface exported.", cr_server.head_spu->name);
+    }
+#endif
+
     while ((err = cr_server.head_spu->dispatch_table.GetError()) != GL_NO_ERROR)
         crWarning("crServer: glGetError %d after loading snapshot", err);