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

Timestamp:

Jun 26, 2013 1:01:07 PM (12 years ago)

Author:

vboxsync

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

86738

Message:

wddm/crOpenGL: more TexPresent fixes

File:

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

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

@@ -187 +187 @@
     crFreeHashtable(cr_server.muralTable, deleteMuralInfoCallback);
 
+    crServerDisplayTermAll();
+    CrDemTerm(&cr_server.PresentTexturepMap);
+    memset(cr_server.DisplaysInitMap, 0, sizeof (cr_server.DisplaysInitMap));
+    memset(cr_server.aDispplays, 0, sizeof (cr_server.aDispplays));
+
     for (i = 0; i < cr_server.numClients; i++) {
         if (cr_server.clients[i]) {
@@ -333 +338 @@
     }
 
+    env = crGetenv("CR_SERVER_CAPS");
+    if (env && env[0] != '\0')
+    {
+        cr_server.u32Caps = crServerVBoxParseNumerics(env, 0);
+        cr_server.u32Caps &= ~(CR_VBOX_CAP_TEX_PRESENT | CR_VBOX_CAP_NO_DWM_SUPPORT);
+    }
+    else
+    {
+        cr_server.u32Caps = 0;
+#ifdef DEBUG_misha
+        cr_server.u32Caps = CR_VBOX_CAP_TEX_PRESENT;
+#endif
+    }
+
     cr_server.firstCallCreateContext = GL_TRUE;
     cr_server.firstCallMakeCurrent = GL_TRUE;
@@ -362 +381 @@
     cr_server.dummyMuralTable = crAllocHashtable();
 
+    CrDemInit(&cr_server.PresentTexturepMap);
+    memset(cr_server.DisplaysInitMap, 0, sizeof (cr_server.DisplaysInitMap));
+    memset(cr_server.aDispplays, 0, sizeof (cr_server.aDispplays));
+
     cr_server.fRootVrOn = GL_FALSE;
     VBoxVrListInit(&cr_server.RootVr);
@@ -425 +448 @@
         crInfo("Info: using multiple contexts!");
         crDebug("Debug: using multiple contexts!");
+    }
+
+    env = crGetenv("CR_SERVER_CAPS");
+    if (env && env[0] != '\0')
+    {
+        cr_server.u32Caps = crServerVBoxParseNumerics(env, 0);
+        cr_server.u32Caps &= ~(CR_VBOX_CAP_TEX_PRESENT | CR_VBOX_CAP_NO_DWM_SUPPORT);
+    }
+    else
+    {
+        cr_server.u32Caps = 0;
+#ifdef DEBUG_misha
+        cr_server.u32Caps = CR_VBOX_CAP_TEX_PRESENT;
+#endif
     }
 
@@ -464 +501 @@
 
     cr_server.dummyMuralTable = crAllocHashtable();
+
+    CrDemInit(&cr_server.PresentTexturepMap);
+    memset(cr_server.DisplaysInitMap, 0, sizeof (cr_server.DisplaysInitMap));
+    memset(cr_server.aDispplays, 0, sizeof (cr_server.aDispplays));
 
     cr_server.fRootVrOn = GL_FALSE;
@@ -970 +1011 @@
             return NULL;
         }
-        id = crServerMuralInit(pMural, "", visualBits, -1);
+        id = crServerMuralInit(pMural, "", visualBits, -1, GL_TRUE);
         if (id < 0)
         {