Changeset 48793 in vbox for trunk

Timestamp:

Oct 1, 2013 12:20:04 PM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: adjust & log config bits

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server_config.c (modified) (2 diffs)
• server_main.c (modified) (2 diffs)

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

@@ -243 +243 @@
     cr_server.fVramPresentModeDefault = CR_SERVER_REDIR_F_FBO_RAM/* | CR_SERVER_REDIR_F_FBO_RPW*/;
 
+    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 = CR_VBOX_CAP_TEX_PRESENT/* | CR_VBOX_CAP_NO_DWM_SUPPORT*/;
+    }
+
+    if (!(cr_server.fPresentModeDefault & CR_SERVER_REDIR_F_FBO))
+    {
+        /* can not do tex present in case CR_SERVER_REDIR_F_FBO is disabled */
+        cr_server.u32Caps &= ~CR_VBOX_CAP_TEX_PRESENT;
+    }
+
+    crInfo("Cfg: fPresentModeDefault(%#x), fVramPresentModeDefault(%#x), u32Caps(%#x)",
+            cr_server.fPresentModeDefault, cr_server.fVramPresentModeDefault, cr_server.u32Caps);
+
     /* Need to do this as early as possible */
 
@@ -387 +407 @@
     cr_server.fVramPresentModeDefault = CR_SERVER_REDIR_F_FBO_RAM/* | CR_SERVER_REDIR_F_FBO_RPW*/;
 
+    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 = CR_VBOX_CAP_TEX_PRESENT/* | CR_VBOX_CAP_NO_DWM_SUPPORT*/;
+    }
+
+    if (!(cr_server.fPresentModeDefault & CR_SERVER_REDIR_F_FBO))
+    {
+        /* can not do tex present in case CR_SERVER_REDIR_F_FBO is disabled */
+        cr_server.u32Caps &= ~CR_VBOX_CAP_TEX_PRESENT;
+    }
+
+    crInfo("Cfg: fPresentModeDefault(%#x), fVramPresentModeDefault(%#x), u32Caps(%#x)",
+            cr_server.fPresentModeDefault, cr_server.fVramPresentModeDefault, cr_server.u32Caps);
+
     cr_server.head_spu->dispatch_table.GetChromiumParametervCR(GL_WINDOW_POSITION_CR, 0, GL_INT, 2, &dims[0]);
     cr_server.head_spu->dispatch_table.GetChromiumParametervCR(GL_WINDOW_SIZE_CR, 0, GL_INT, 2, &dims[2]);

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

@@ -340 +340 @@
     }
 
-    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 = CR_VBOX_CAP_TEX_PRESENT;
-    }
-
     cr_server.firstCallCreateContext = GL_TRUE;
     cr_server.firstCallMakeCurrent = GL_TRUE;
@@ -449 +438 @@
         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 = CR_VBOX_CAP_TEX_PRESENT;
     }