Changeset 29221 in vbox for trunk/src

Timestamp:

May 7, 2010 3:10:09 PM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: remove unnecessary check

File:

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

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

@@ -26 +26 @@
 
 /**
- * \mainpage CrServerLib 
+ * \mainpage CrServerLib
  *
  * \section CrServerLibIntroduction Introduction
@@ -91 +91 @@
     crFreeHashtable(cr_server.semaphores, crFree);
     cr_server.semaphores = NULL;
- 
+
     /* Deallocate all barriers */
     crFreeHashtable(cr_server.barriers, DeleteBarrierCallback);
@@ -329 +329 @@
     }
 
-    newClient = (CRClient *) crCalloc(sizeof(CRClient));    
+    newClient = (CRClient *) crCalloc(sizeof(CRClient));
     crDebug("crServer: AddClient u32ClientID=%d", u32ClientID);
 
@@ -356 +356 @@
     for (i = 0; i < cr_server.numClients; i++)
     {
-        if (cr_server.clients[i] && cr_server.clients[i]->conn 
-            && cr_server.clients[i]->conn->u32ClientID==u32ClientID) 
+        if (cr_server.clients[i] && cr_server.clients[i]->conn
+            && cr_server.clients[i]->conn->u32ClientID==u32ClientID)
         {
             break;
@@ -381 +381 @@
     for (i = 0; i < cr_server.numClients; i++)
     {
-        if (cr_server.clients[i] && cr_server.clients[i]->conn 
-            && cr_server.clients[i]->conn->u32ClientID==u32ClientID) 
+        if (cr_server.clients[i] && cr_server.clients[i]->conn
+            && cr_server.clients[i]->conn->u32ClientID==u32ClientID)
         {
             break;
@@ -404 +404 @@
         pClient->conn->allow_redir_ptr = 0;
     }
-    else    
+    else
     {
         pClient->conn->allow_redir_ptr = 1;
     }
-    
+
     pClient->conn->pBuffer = pBuffer;
     pClient->conn->cbBuffer = cbBuffer;
@@ -460 +460 @@
     for (i = 0; i < cr_server.numClients; i++)
     {
-        if (cr_server.clients[i] && cr_server.clients[i]->conn 
-            && cr_server.clients[i]->conn->u32ClientID==u32ClientID) 
+        if (cr_server.clients[i] && cr_server.clients[i]->conn
+            && cr_server.clients[i]->conn->u32ClientID==u32ClientID)
         {
             break;
@@ -491 +491 @@
         pClient->conn->cbHostBuffer = 0;
     }
-    
+
     return VINF_SUCCESS;
 }
@@ -502 +502 @@
     for (i = 0; i < cr_server.numClients; i++)
     {
-        if (cr_server.clients[i] && cr_server.clients[i]->conn 
-            && cr_server.clients[i]->conn->u32ClientID==u32ClientID) 
+        if (cr_server.clients[i] && cr_server.clients[i]->conn
+            && cr_server.clients[i]->conn->u32ClientID==u32ClientID)
         {
             break;
@@ -603 +603 @@
     rc = SSMR3PutMem(pSSM, &key, sizeof(key));
     CRASSERT(rc == VINF_SUCCESS);
-    
+
 #ifdef CR_STATE_NO_TEXTURE_IMAGE_STORE
     if (cr_server.curClient)
@@ -677 +677 @@
 
     /* Save contexts state tracker data */
-    /* @todo For now just some blind data dumps, 
+    /* @todo For now just some blind data dumps,
      * but I've a feeling those should be saved/restored in a very strict sequence to
-     * allow diff_api to work correctly. 
+     * allow diff_api to work correctly.
      * Should be tested more with multiply guest opengl apps working when saving VM snapshot.
      */
@@ -700 +700 @@
     /* Save cr_server.muralTable
      * @todo we don't need it all, just geometry info actually
-     * @todo store visible regions as well 
+     * @todo store visible regions as well
      */
     ui32 = crHashtableNumElements(cr_server.muralTable);
@@ -716 +716 @@
     for (i = 0; i < cr_server.numClients; i++)
     {
-        if (cr_server.clients[i] && cr_server.clients[i]->conn) 
+        if (cr_server.clients[i] && cr_server.clients[i]->conn)
         {
             CRClient *pClient = cr_server.clients[i];
@@ -817 +817 @@
         rc = crStateLoadContext(pContext, pSSM);
         AssertRCReturn(rc, rc);
-    }    
+    }
 
     /* Load windows */
@@ -892 +892 @@
     for (i = 0; i < cr_server.numClients; i++)
     {
-        if (cr_server.clients[i] && cr_server.clients[i]->conn) 
+        if (cr_server.clients[i] && cr_server.clients[i]->conn)
         {
             CRClient *pClient = cr_server.clients[i];
@@ -983 +983 @@
             cr_server.head_spu->dispatch_table.Enable(GL_CULL_FACE);
             cr_server.head_spu->dispatch_table.Enable(GL_TEXTURE_2D);*/
-            
+
             //crStateViewport( 0, 0, 600, 600 );
             //pClient->currentMural->viewportValidated = GL_FALSE;
@@ -1103 +1103 @@
         return VERR_INVALID_PARAMETER;
 
-    if (winID==0)
-        return VERR_INVALID_PARAMETER;
-
     if (MAPPED(SCREEN(sIndex)) && SCREEN(sIndex).winID!=winID)
     {
@@ -1134 +1131 @@
             if (cr_server.curClient->currentCtx
                 && cr_server.curClient->currentCtx->pImage
-                && cr_server.curClient->currentMural 
+                && cr_server.curClient->currentMural
                 && cr_server.curClient->currentMural->screenId == sIndex
                 && cr_server.curClient->currentCtx->viewport.viewportH == h
@@ -1153 +1150 @@
     }
 #endif
-    
+
     return VINF_SUCCESS;
 }