Changeset 53233 in vbox

Timestamp:

Nov 5, 2014 11:24:39 AM (10 years ago)

Author:

vboxsync

Message:

Host 3D: Chromium server: drop non-functional code.

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

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

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

@@ -111 +111 @@
     spu_names[i] = NULL;
 
-    //spu_dir = crStrdup(response);
     crNetSetRank(0);
     crNetSetContextRange(32, 35);
@@ -118 +117 @@
     crNetSetKey(key,sizeof(key));
     cr_server.tcpip_port = 7000;
-
-        /*cr_server.optimizeBucket = crStrToInt(response);
-        cr_server.localTileSpec = crStrToInt(response);
-        cr_server.useL2 = crStrToInt(response);
-        cr_server.ignore_papi = crStrToInt(response);
-        if (crMothershipGetServerParam(conn, response, "overlap_blending"))
-        {
-            if (!crStrcmp(response, "blend"))
-                cr_server.overlapBlending = 1;
-            else if (!crStrcmp(response, "knockout"))
-                cr_server.overlapBlending = 2;
-        }
-        if (crMothershipGetServerParam(conn, response, "overlap_levels"))
-        cr_server.only_swap_once = crStrToInt(response);
-        cr_server.debug_barriers = crStrToInt(response);
-        cr_server.sharedDisplayLists = crStrToInt(response);
-        cr_server.sharedTextureObjects = crStrToInt(response);
-        cr_server.sharedPrograms = crStrToInt(response);
-        cr_server.sharedWindows = crStrToInt(response);
-        cr_server.uniqueWindows = crStrToInt(response);
-        cr_server.useDMX = crStrToInt(response);
-        if (crMothershipGetServerParam(conn, response, "vertprog_projection_param"))
-        if (crMothershipGetServerParam(conn, response, "stereo_view"))
-        if (crMothershipGetServerParam(conn, response, "view_matrix"))
-        if (crMothershipGetServerParam(conn, response, "right_view_matrix"))
-        if (crMothershipGetServerParam(conn, response, "projection_matrix"))
-        if (crMothershipGetServerParam(conn, response, "right_projection_matrix"))*/
 
     crDebug("CRServer: my port number is %d", cr_server.tcpip_port);
@@ -317 +289 @@
         cr_server.fVisualBitsDefault = CR_RGB_BIT | CR_ALPHA_BIT | CR_DOUBLE_BIT;
 
+
     env = crGetenv("CR_SERVER_CAPS");
     if (env && env[0] != '\0')

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

@@ -743 +743 @@
 
     crServerServiceClients();
-
-#if 0
-        if (pClient->currentMural) {
-            crStateViewport( 0, 0, 500, 500 );
-            pClient->currentMural->viewportValidated = GL_FALSE;
-            cr_server.head_spu->dispatch_table.Viewport( 0, 0, 500, 500 );
-            crStateViewport( 0, 0, 600, 600 );
-            pClient->currentMural->viewportValidated = GL_FALSE;
-            cr_server.head_spu->dispatch_table.Viewport( 0, 0, 600, 600 );
-
-            crStateMatrixMode(GL_PROJECTION);
-            cr_server.head_spu->dispatch_table.MatrixMode(GL_PROJECTION);
-            crServerDispatchLoadIdentity();
-            crStateFrustum(-0.6, 0.6, -0.5, 0.5, 1.5, 150.0);
-            cr_server.head_spu->dispatch_table.Frustum(-0.6, 0.6, -0.5, 0.5, 1.5, 150.0);
-            crServerDispatchLoadIdentity();
-            crStateFrustum(-0.5, 0.5, -0.5, 0.5, 1.5, 150.0);
-            cr_server.head_spu->dispatch_table.Frustum(-0.5, 0.5, -0.5, 0.5, 1.5, 150.0);
-
-            crStateMatrixMode(GL_MODELVIEW);
-            cr_server.head_spu->dispatch_table.MatrixMode(GL_MODELVIEW);
-            crServerDispatchLoadIdentity();
-            crStateFrustum(-0.5, 0.5, -0.5, 0.5, 1.5, 150.0);
-            cr_server.head_spu->dispatch_table.Frustum(-0.5, 0.5, -0.5, 0.5, 1.5, 150.0);
-            crServerDispatchLoadIdentity();
-        }
-#endif
-
     crStateResetCurrentPointers(&cr_server.current);
 
@@ -792 +764 @@
     if (RT_FAILURE(rc))
         return rc;
-
 
     CRASSERT(pBuffer);
@@ -1387 +1358 @@
     }
 
-    if ((pCtxInfo->CreateInfo.requestedVisualBits & CR_STENCIL_BIT)
-                || (pCtxInfo->CreateInfo.requestedVisualBits & CR_DEPTH_BIT))
+    if (   (pCtxInfo->CreateInfo.requestedVisualBits & CR_STENCIL_BIT)
+        || (pCtxInfo->CreateInfo.requestedVisualBits & CR_DEPTH_BIT))
     {
         pEl = &pData->aElements[pData->cElements];