Changeset 45248 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_config.c

Timestamp:

Mar 29, 2013 2:57:24 PM (12 years ago)

Author:

vboxsync

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

84629

Message:

crOpenGL/VRDP: always show 3D window unles in Headles mode

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_config.c (modified) (7 diffs)

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

@@ -52 +52 @@
 
     cr_server.screenCount = 0;
-    cr_server.bForceOffscreenRendering = CR_SERVER_REDIR_NONE;
-    cr_server.bOffscreenRenderingDefault = cr_server.bForceOffscreenRendering;
+    cr_server.fPresentMode = CR_SERVER_REDIR_F_NONE;
+    cr_server.fPresentModeDefault = cr_server.fPresentMode;
     cr_server.bUsePBOForReadback = GL_FALSE;
     cr_server.bUseOutputRedirect = GL_FALSE;
+}
+
+static int crServerVBoxParseNumerics(const char *pszStr, const int defaultVal)
+{
+    int result = 0;
+    bool neg = false;
+    unsigned char iDigit = 0;
+    if (!pszStr || pszStr[0] == '\0')
+        return defaultVal;
+
+    for (;;)
+    {
+        if (pszStr[0] == '\0')
+            return defaultVal;
+
+        if (pszStr[0] == ' ' || pszStr[0] == '\t' || pszStr[0] == '\n')
+        {
+            ++pszStr;
+            continue;
+        }
+
+        if (pszStr[0] == '-')
+        {
+            if (neg)
+                return defaultVal;
+
+            neg = true;
+            ++pszStr;
+            continue;
+        }
+
+        break;
+    }
+
+    for (;;)
+    {
+        unsigned char digit;
+        if (pszStr[0] == '\0')
+        {
+            if (!iDigit)
+                return defaultVal;
+            break;
+        }
+
+        digit = pszStr[0] - '0';
+        if (digit > 9)
+            return defaultVal;
+
+        result *= 10;
+        result += digit;
+        ++iDigit;
+
+        ++pszStr;
+    }
+
+    return !neg ? result : -result;
 }
 
@@ -155 +211 @@
 
     env = crGetenv( "CR_SERVER_DEFAULT_RENDER_TYPE" );
-    if (env != NULL)
-    {
-        GLubyte redir = (env[0] - 0x30);
-        if (redir <= CR_SERVER_REDIR_MAXVAL)
+    if (env != NULL && env[0] != '\0')
+    {
+        unsigned int redir = (unsigned int)crServerVBoxParseNumerics(env, CR_SERVER_REDIR_F_NONE);
+        if (redir <= CR_SERVER_REDIR_F_ALL)
         {
             int rc = crServerSetOffscreenRenderingMode(redir);
@@ -168 +224 @@
     }
 #if defined(RT_OS_DARWIN) || defined(RT_OS_WINDOWS) || defined(GLX)
-    else
-    {
-        int rc = crServerSetOffscreenRenderingMode(CR_SERVER_REDIR_FBO_BLT);
+    if (cr_server.fPresentMode == CR_SERVER_REDIR_F_NONE)
+    {
+        /* the CR_SERVER_REDIR_F_FBO_BLT is set only if parent window is received, which means we are not in headles */
+        int rc = crServerSetOffscreenRenderingMode(CR_SERVER_REDIR_F_FBO | CR_SERVER_REDIR_F_DISPLAY);
         if (!RT_SUCCESS(rc))
             crWarning("offscreen rendering unsupported, no offscreen rendering will be used..");
@@ -176 +233 @@
     }
 #endif
-    cr_server.bOffscreenRenderingDefault = cr_server.bForceOffscreenRendering;
+    cr_server.fPresentModeDefault = cr_server.fPresentMode;
 
     /* Need to do this as early as possible */
@@ -297 +354 @@
 
     env = crGetenv( "CR_SERVER_DEFAULT_RENDER_TYPE" );
-    if (env != NULL)
-    {
-        GLubyte redir = (env[0] - 0x30);
-        if (redir <= CR_SERVER_REDIR_MAXVAL)
+    if (env != NULL && env[0] != '\0')
+    {
+        unsigned int redir = (unsigned int)crServerVBoxParseNumerics(env, CR_SERVER_REDIR_F_NONE);
+        if (redir <= CR_SERVER_REDIR_F_ALL)
         {
             int rc = crServerSetOffscreenRenderingMode(redir);
             if (!RT_SUCCESS(rc))
-                            crWarning("offscreen rendering unsupported, no offscreen rendering will be used..");
+                crWarning("offscreen rendering unsupported, no offscreen rendering will be used..");
         }
         else
@@ -310 +367 @@
     }
 #if defined(RT_OS_DARWIN) || defined(RT_OS_WINDOWS) || defined(GLX)
-    else
-    {
-        int rc = crServerSetOffscreenRenderingMode(CR_SERVER_REDIR_FBO_BLT);
+    if (cr_server.fPresentMode == CR_SERVER_REDIR_F_NONE)
+    {
+        /* the CR_SERVER_REDIR_F_FBO_BLT is set only if parent window is received, which means we are not in headles */
+        int rc = crServerSetOffscreenRenderingMode(CR_SERVER_REDIR_F_FBO | CR_SERVER_REDIR_F_DISPLAY);
         if (!RT_SUCCESS(rc))
             crWarning("offscreen rendering unsupported, no offscreen rendering will be used..");
@@ -318 +376 @@
     }
 #endif
-    cr_server.bOffscreenRenderingDefault = cr_server.bForceOffscreenRendering;
+    cr_server.fPresentModeDefault = cr_server.fPresentMode;
 
     cr_server.head_spu->dispatch_table.GetChromiumParametervCR(GL_WINDOW_POSITION_CR, 0, GL_INT, 2, &dims[0]);