Changeset 15758 in vbox for trunk/src/VBox/Additions/WINNT/Graphics

Timestamp:

Dec 25, 2008 3:55:38 PM (16 years ago)

Author:

vboxsync

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

41326

Message:

crOpenGL: tabs to spaces

File:

• trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL/pack/packspu_context.c (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL/pack/packspu_context.c

@@ -23 +23 @@
 ThreadInfo *packspuNewThread( unsigned long id )
 {
-        ThreadInfo *thread;
-
-#ifdef CHROMIUM_THREADSAFE
-        crLockMutex(&_PackMutex);
+    ThreadInfo *thread;
+
+#ifdef CHROMIUM_THREADSAFE
+    crLockMutex(&_PackMutex);
 #else
-        CRASSERT(pack_spu.numThreads == 0);
-#endif
-
-        CRASSERT(pack_spu.numThreads < MAX_THREADS);
-        thread = &(pack_spu.thread[pack_spu.numThreads]);
-
-        thread->id = id;
-        thread->currentContext = NULL;
-
-        /* connect to the server */
-        thread->netServer.name = crStrdup( pack_spu.name );
-        thread->netServer.buffer_size = pack_spu.buffer_size;
-        if (pack_spu.numThreads == 0) {
-                packspuConnectToServer( &(thread->netServer) );
-                if (!thread->netServer.conn) {
-                        return NULL;
-                }
-                pack_spu.swap = thread->netServer.conn->swap;
-        }
-        else {
-                /* a new pthread */
-                crNetNewClient( pack_spu.thread[0].netServer.conn, &(thread->netServer));
-                CRASSERT(thread->netServer.conn);
-        }
-
-        /* packer setup */
-        CRASSERT(thread->packer == NULL);
-        thread->packer = crPackNewContext( pack_spu.swap );
-        CRASSERT(thread->packer);
-        crPackInitBuffer( &(thread->buffer), crNetAlloc(thread->netServer.conn),
-                                thread->netServer.conn->buffer_size, thread->netServer.conn->mtu );
-        thread->buffer.canBarf = thread->netServer.conn->Barf ? GL_TRUE : GL_FALSE;
-        crPackSetBuffer( thread->packer, &thread->buffer );
-        crPackFlushFunc( thread->packer, packspuFlush );
-        crPackFlushArg( thread->packer, (void *) thread );
-        crPackSendHugeFunc( thread->packer, packspuHuge );
-        crPackSetContext( thread->packer );
-
-#ifdef CHROMIUM_THREADSAFE
-        crSetTSD(&_PackTSD, thread);
-#endif
-
-        pack_spu.numThreads++;
-
-#ifdef CHROMIUM_THREADSAFE
-        crUnlockMutex(&_PackMutex);
-#endif
-        return thread;
+    CRASSERT(pack_spu.numThreads == 0);
+#endif
+
+    CRASSERT(pack_spu.numThreads < MAX_THREADS);
+    thread = &(pack_spu.thread[pack_spu.numThreads]);
+
+    thread->id = id;
+    thread->currentContext = NULL;
+
+    /* connect to the server */
+    thread->netServer.name = crStrdup( pack_spu.name );
+    thread->netServer.buffer_size = pack_spu.buffer_size;
+    if (pack_spu.numThreads == 0) {
+        packspuConnectToServer( &(thread->netServer) );
+        if (!thread->netServer.conn) {
+            return NULL;
+        }
+        pack_spu.swap = thread->netServer.conn->swap;
+    }
+    else {
+        /* a new pthread */
+        crNetNewClient(pack_spu.thread[0].netServer.conn, &(thread->netServer));
+        CRASSERT(thread->netServer.conn);
+    }
+
+    /* packer setup */
+    CRASSERT(thread->packer == NULL);
+    thread->packer = crPackNewContext( pack_spu.swap );
+    CRASSERT(thread->packer);
+    crPackInitBuffer( &(thread->buffer), crNetAlloc(thread->netServer.conn),
+                thread->netServer.conn->buffer_size, thread->netServer.conn->mtu );
+    thread->buffer.canBarf = thread->netServer.conn->Barf ? GL_TRUE : GL_FALSE;
+    crPackSetBuffer( thread->packer, &thread->buffer );
+    crPackFlushFunc( thread->packer, packspuFlush );
+    crPackFlushArg( thread->packer, (void *) thread );
+    crPackSendHugeFunc( thread->packer, packspuHuge );
+    crPackSetContext( thread->packer );
+
+#ifdef CHROMIUM_THREADSAFE
+    crSetTSD(&_PackTSD, thread);
+#endif
+
+    pack_spu.numThreads++;
+
+#ifdef CHROMIUM_THREADSAFE
+    crUnlockMutex(&_PackMutex);
+#endif
+    return thread;
 }
 
@@ -82 +82 @@
 packspu_CreateContext( const char *dpyName, GLint visual, GLint shareCtx )
 {
-        int writeback = 1;
-        GLint serverCtx = (GLint) -1;
-        int slot;
-
-#ifdef CHROMIUM_THREADSAFE
-        crLockMutex(&_PackMutex);
-#endif
-
-        if (shareCtx > 0) {
-                /* translate to server ctx id */
-                shareCtx -= MAGIC_OFFSET;
-                if (shareCtx >= 0 && shareCtx < pack_spu.numContexts) {
-                        shareCtx = pack_spu.context[shareCtx].serverCtx;
-                }
-        }
-
-        crPackSetContext( pack_spu.thread[0].packer );
-
-        /* Pack the command */
-        if (pack_spu.swap)
-                crPackCreateContextSWAP( dpyName, visual, shareCtx, &serverCtx, &writeback );
-        else
-                crPackCreateContext( dpyName, visual, shareCtx, &serverCtx, &writeback );
-
-        /* Flush buffer and get return value */
-        packspuFlush( &(pack_spu.thread[0]) );
-        if (!(pack_spu.thread[0].netServer.conn->actual_network))
-        {
-                /* HUMUNGOUS HACK TO MATCH SERVER NUMBERING
-                 *
-                 * The hack exists solely to make file networking work for now.  This
-                 * is totally gross, but since the server expects the numbers to start
-                 * from 5000, we need to write them out this way.  This would be
-                 * marginally less gross if the numbers (500 and 5000) were maybe
-                 * some sort of #define'd constants somewhere so the client and the
-                 * server could be aware of how each other were numbering things in
-                 * cases like file networking where they actually
-                 * care. 
-                 *
-                 *      -Humper 
-                 *
-                 */
-                serverCtx = 5000;
-        }
-        else {
-                while (writeback)
-                        crNetRecv();
-
-                if (pack_spu.swap) {
-                        serverCtx = (GLint) SWAP32(serverCtx);
-                }
-                if (serverCtx < 0) {
-#ifdef CHROMIUM_THREADSAFE
-                        crUnlockMutex(&_PackMutex);
-#endif
-                        crWarning("Failure in packspu_CreateContext");
-                        return -1;  /* failed */
-                }
-        }
-
-        /* find an empty context slot */
-        for (slot = 0; slot < pack_spu.numContexts; slot++) {
-                if (!pack_spu.context[slot].clientState) {
-                        /* found empty slot */
-                        break;
-                }
-        }
-        if (slot == pack_spu.numContexts) {
-                pack_spu.numContexts++;
-        }
-
-        /* Fill in the new context info */
-        /* XXX fix-up sharedCtx param here */
-        pack_spu.context[slot].clientState = crStateCreateContext(NULL, visual, NULL);
-        pack_spu.context[slot].serverCtx = serverCtx;
-
-#ifdef CHROMIUM_THREADSAFE
-        crUnlockMutex(&_PackMutex);
-#endif
-
-        return MAGIC_OFFSET + slot;
+    int writeback = 1;
+    GLint serverCtx = (GLint) -1;
+    int slot;
+
+#ifdef CHROMIUM_THREADSAFE
+    crLockMutex(&_PackMutex);
+#endif
+
+    if (shareCtx > 0) {
+        /* translate to server ctx id */
+        shareCtx -= MAGIC_OFFSET;
+        if (shareCtx >= 0 && shareCtx < pack_spu.numContexts) {
+            shareCtx = pack_spu.context[shareCtx].serverCtx;
+        }
+    }
+
+    crPackSetContext( pack_spu.thread[0].packer );
+
+    /* Pack the command */
+    if (pack_spu.swap)
+        crPackCreateContextSWAP( dpyName, visual, shareCtx, &serverCtx, &writeback );
+    else
+        crPackCreateContext( dpyName, visual, shareCtx, &serverCtx, &writeback );
+
+    /* Flush buffer and get return value */
+    packspuFlush( &(pack_spu.thread[0]) );
+    if (!(pack_spu.thread[0].netServer.conn->actual_network))
+    {
+        /* HUMUNGOUS HACK TO MATCH SERVER NUMBERING
+         *
+         * The hack exists solely to make file networking work for now.  This
+         * is totally gross, but since the server expects the numbers to start
+         * from 5000, we need to write them out this way.  This would be
+         * marginally less gross if the numbers (500 and 5000) were maybe
+         * some sort of #define'd constants somewhere so the client and the
+         * server could be aware of how each other were numbering things in
+         * cases like file networking where they actually
+         * care. 
+         *
+         *  -Humper 
+         *
+         */
+        serverCtx = 5000;
+    }
+    else {
+        while (writeback)
+            crNetRecv();
+
+        if (pack_spu.swap) {
+            serverCtx = (GLint) SWAP32(serverCtx);
+        }
+        if (serverCtx < 0) {
+#ifdef CHROMIUM_THREADSAFE
+            crUnlockMutex(&_PackMutex);
+#endif
+            crWarning("Failure in packspu_CreateContext");
+            return -1;  /* failed */
+        }
+    }
+
+    /* find an empty context slot */
+    for (slot = 0; slot < pack_spu.numContexts; slot++) {
+        if (!pack_spu.context[slot].clientState) {
+            /* found empty slot */
+            break;
+        }
+    }
+    if (slot == pack_spu.numContexts) {
+        pack_spu.numContexts++;
+    }
+
+    /* Fill in the new context info */
+    /* XXX fix-up sharedCtx param here */
+    pack_spu.context[slot].clientState = crStateCreateContext(NULL, visual, NULL);
+    pack_spu.context[slot].serverCtx = serverCtx;
+
+#ifdef CHROMIUM_THREADSAFE
+    crUnlockMutex(&_PackMutex);
+#endif
+
+    return MAGIC_OFFSET + slot;
 }
 
@@ -168 +168 @@
 void PACKSPU_APIENTRY packspu_DestroyContext( GLint ctx )
 {
-        const int slot = ctx - MAGIC_OFFSET;
-        ContextInfo *context;
-        GET_THREAD(thread);
-
-        CRASSERT(slot >= 0);
-        CRASSERT(slot < pack_spu.numContexts);
-        CRASSERT(thread);
-
-        context = &(pack_spu.context[slot]);
-
-        if (pack_spu.swap)
-                crPackDestroyContextSWAP( context->serverCtx );
-        else
-                crPackDestroyContext( context->serverCtx );
-
-        crStateDestroyContext( context->clientState );
-
-        context->clientState = NULL;
-        context->serverCtx = 0;
-
-        if (thread->currentContext == context) {
-                thread->currentContext = NULL;
-                crStateMakeCurrent( NULL );
-        }
+    const int slot = ctx - MAGIC_OFFSET;
+    ContextInfo *context;
+    GET_THREAD(thread);
+
+    CRASSERT(slot >= 0);
+    CRASSERT(slot < pack_spu.numContexts);
+    CRASSERT(thread);
+
+    context = &(pack_spu.context[slot]);
+
+    if (pack_spu.swap)
+        crPackDestroyContextSWAP( context->serverCtx );
+    else
+        crPackDestroyContext( context->serverCtx );
+
+    crStateDestroyContext( context->clientState );
+
+    context->clientState = NULL;
+    context->serverCtx = 0;
+
+    if (thread->currentContext == context) {
+        thread->currentContext = NULL;
+        crStateMakeCurrent( NULL );
+    }
 }
 
@@ -197 +197 @@
 void PACKSPU_APIENTRY packspu_MakeCurrent( GLint window, GLint nativeWindow, GLint ctx )
 {
-        GET_THREAD(thread);
-        GLint serverCtx;
-        ContextInfo *newCtx;
-
-        if (!thread) {
-                thread = packspuNewThread( crThreadID() );
-        }
-        CRASSERT(thread);
-        CRASSERT(thread->packer);
-
-        if (ctx) {
-                const int slot = ctx - MAGIC_OFFSET;
-
-                CRASSERT(slot >= 0);
-                CRASSERT(slot < pack_spu.numContexts);
-
-                newCtx = &pack_spu.context[slot];
-                CRASSERT(newCtx->clientState);  /* verify valid */
-
-                thread->currentContext = newCtx;
-
-                crPackSetContext( thread->packer );
-                crStateMakeCurrent( newCtx->clientState );
-                serverCtx = pack_spu.context[slot].serverCtx;
-        }
-        else {
-                thread->currentContext = NULL;
-                crStateMakeCurrent( NULL );
-                newCtx = NULL;
-                serverCtx = 0;
-        }
-
-        if (pack_spu.swap)
-                crPackMakeCurrentSWAP( window, nativeWindow, serverCtx );
-        else
-                crPackMakeCurrent( window, nativeWindow, serverCtx );
-
-        {
-                GET_THREAD(t);
-                (void) t;
-                CRASSERT(t);
-        }
-}
+    GET_THREAD(thread);
+    GLint serverCtx;
+    ContextInfo *newCtx;
+
+    if (!thread) {
+        thread = packspuNewThread( crThreadID() );
+    }
+    CRASSERT(thread);
+    CRASSERT(thread->packer);
+
+    if (ctx) {
+        const int slot = ctx - MAGIC_OFFSET;
+
+        CRASSERT(slot >= 0);
+        CRASSERT(slot < pack_spu.numContexts);
+
+        newCtx = &pack_spu.context[slot];
+        CRASSERT(newCtx->clientState);  /* verify valid */
+
+        thread->currentContext = newCtx;
+
+        crPackSetContext( thread->packer );
+        crStateMakeCurrent( newCtx->clientState );
+        serverCtx = pack_spu.context[slot].serverCtx;
+    }
+    else {
+        thread->currentContext = NULL;
+        crStateMakeCurrent( NULL );
+        newCtx = NULL;
+        serverCtx = 0;
+    }
+
+    if (pack_spu.swap)
+        crPackMakeCurrentSWAP( window, nativeWindow, serverCtx );
+    else
+        crPackMakeCurrent( window, nativeWindow, serverCtx );
+
+    {
+        GET_THREAD(t);
+        (void) t;
+        CRASSERT(t);
+    }
+}