Changeset 15758 in vbox

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

Location:

trunk/src/VBox

Files:

• Additions/WINNT/Graphics/crOpenGL/pack/packspu_context.c (modified) (4 diffs)
• HostServices/SharedOpenGL/crserverlib/get_sizes.py (modified) (3 diffs)
• HostServices/SharedOpenGL/crserverlib/server_stream.c (modified) (1 diff)

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);
+    }
+}

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/get_sizes.py

@@ -6 +6 @@
 
 num_get_values = {
-        'GL_ACCUM_ALPHA_BITS' : 1,
-        'GL_ACCUM_BLUE_BITS' : 1,
-        'GL_ACCUM_CLEAR_VALUE': 4,
-        'GL_ACCUM_GREEN_BITS' : 1,
-        'GL_ACCUM_RED_BITS' : 1,
-        'GL_ALPHA_BIAS' : 1,
-        'GL_ALPHA_BITS' : 1,
-        'GL_ALPHA_SCALE' : 1,
-        'GL_ALPHA_TEST' : 1,
-        'GL_ALPHA_TEST_FUNC' : 1,
-        'GL_ALPHA_TEST_REF' : 1,
-        'GL_ATTRIB_STACK_DEPTH' : 1,
-        'GL_AUTO_NORMAL' : 1,
-        'GL_AUX_BUFFERS' : 1,
-        'GL_BLEND' : 1,
-        'GL_BLEND_DST' : 1,
-        'GL_BLEND_SRC' : 1,
-        'GL_BLUE_BIAS' : 1,
-        'GL_BLUE_BITS' : 1,
-        'GL_BLUE_SCALE' : 1,
-        'GL_CLIENT_ATTRIB_STACK_DEPTH' : 1,
-        'GL_CLIP_PLANE0' : 1,
-        'GL_CLIP_PLANE1' : 1,
-        'GL_CLIP_PLANE2' : 1,
-        'GL_CLIP_PLANE3' : 1,
-        'GL_CLIP_PLANE4' : 1,
-        'GL_CLIP_PLANE5' : 1,
-        'GL_COLOR_ARRAY' : 1,
-        'GL_COLOR_ARRAY_SIZE' : 1,
-        'GL_COLOR_ARRAY_STRIDE' : 1,
-        'GL_COLOR_ARRAY_TYPE' : 1,
-        'GL_COLOR_CLEAR_VALUE': 4,
-        'GL_COLOR_LOGIC_OP' : 1,
-        'GL_COLOR_MATERIAL' : 1,
-        'GL_COLOR_MATERIAL_FACE' : 1,
-        'GL_COLOR_MATERIAL_PARAMETER' : 1,
-        'GL_COLOR_MATRIX_STACK_DEPTH' : 1,
-        'GL_COLOR_WRITEMASK': 4,
-        'GL_CULL_FACE' : 1,
-        'GL_CULL_FACE_MODE' : 1,
-        'GL_CURRENT_COLOR': 4,
-        'GL_CURRENT_INDEX' : 1,
-        'GL_CURRENT_NORMAL': 3,
-        'GL_CURRENT_RASTER_COLOR': 4,
-        'GL_CURRENT_RASTER_DISTANCE' : 1,
-        'GL_CURRENT_RASTER_INDEX' : 1,
-        'GL_CURRENT_RASTER_POSITION': 4,
-        'GL_CURRENT_RASTER_POSITION_VALID' : 1,
-        'GL_CURRENT_RASTER_TEXTURE_COORDS': 4,
-        'GL_CURRENT_TEXTURE_COORDS': 4,
-        'GL_DEPTH_BIAS' : 1,
-        'GL_DEPTH_BITS' : 1,
-        'GL_DEPTH_CLEAR_VALUE' : 1,
-        'GL_DEPTH_FUNC' : 1,
-        'GL_DEPTH_RANGE': 2,
-        'GL_DEPTH_SCALE' : 1,
-        'GL_DEPTH_TEST' : 1,
-        'GL_DEPTH_WRITEMASK' : 1,
-        'GL_DITHER' : 1,
-        'GL_DOUBLEBUFFER' : 1,
-        'GL_DRAW_BUFFER' : 1,
-        'GL_EDGE_FLAG' : 1,
-        'GL_EDGE_FLAG_ARRAY' : 1,
-        'GL_EDGE_FLAG_ARRAY_STRIDE' : 1,
-        'GL_FEEDBACK_BUFFER_SIZE' : 1,
-        'GL_FEEDBACK_BUFFER_TYPE' : 1,
-        'GL_FOG' : 1,
-        'GL_FOG_COLOR': 4,
-        'GL_FOG_DENSITY' : 1,
-        'GL_FOG_END' : 1,
-        'GL_FOG_HINT' : 1,
-        'GL_FOG_INDEX' : 1,
-        'GL_FOG_MODE' : 1,
-        'GL_FOG_START' : 1,
-        'GL_FRONT_FACE' : 1,
-        'GL_GREEN_BIAS' : 1,
-        'GL_GREEN_BITS' : 1,
-        'GL_GREEN_SCALE' : 1,
-        'GL_INDEX_ARRAY' : 1,
-        'GL_INDEX_ARRAY_STRIDE' : 1,
-        'GL_INDEX_ARRAY_TYPE' : 1,
-        'GL_INDEX_BITS' : 1,
-        'GL_INDEX_CLEAR_VALUE' : 1,
-        'GL_INDEX_LOGIC_OP' : 1,
-        'GL_INDEX_MODE' : 1,
-        'GL_INDEX_OFFSET' : 1,
-        'GL_INDEX_SHIFT' : 1,
-        'GL_INDEX_WRITEMASK' : 1,
-        'GL_LIGHT0' : 1,
-        'GL_LIGHT1' : 1,
-        'GL_LIGHT2' : 1,
-        'GL_LIGHT3' : 1,
-        'GL_LIGHT4' : 1,
-        'GL_LIGHT5' : 1,
-        'GL_LIGHT6' : 1,
-        'GL_LIGHT7' : 1,
-        'GL_LIGHTING' : 1,
-        'GL_LIGHT_MODEL_AMBIENT': 4,
-        'GL_LIGHT_MODEL_LOCAL_VIEWER' : 1,
-        'GL_LIGHT_MODEL_TWO_SIDE' : 1,
-        'GL_LINE_SMOOTH' : 1,
-        'GL_LINE_SMOOTH_HINT' : 1,
-        'GL_LINE_STIPPLE' : 1,
-        'GL_LINE_STIPPLE_PATTERN' : 1,
-        'GL_LINE_STIPPLE_REPEAT' : 1,
-        'GL_LINE_WIDTH' : 1,
-        'GL_LINE_WIDTH_GRANULARITY' : 1,
-        'GL_LINE_WIDTH_RANGE': 2, 
-        'GL_LIST_BASE' : 1,
-        'GL_LIST_INDEX' : 1,
-        'GL_LIST_MODE' : 1,
-        'GL_LOGIC_OP_MODE' : 1,
-        'GL_MAP1_COLOR_4' : 1,
-        'GL_MAP1_GRID_DOMAIN': 2, 
-        'GL_MAP1_GRID_SEGMENTS' : 1,
-        'GL_MAP1_INDEX' : 1,
-        'GL_MAP1_NORMAL' : 1,
-        'GL_MAP1_TEXTURE_COORD_1' : 1,
-        'GL_MAP1_TEXTURE_COORD_2' : 1,
-        'GL_MAP1_TEXTURE_COORD_3' : 1,
-        'GL_MAP1_TEXTURE_COORD_4' : 1,
-        'GL_MAP1_VERTEX_3' : 1,
-        'GL_MAP1_VERTEX_4' : 1,
-        'GL_MAP2_COLOR_4' : 1,
-        'GL_MAP2_GRID_DOMAIN': 4,
-        'GL_MAP2_GRID_SEGMENTS': 2, 
-        'GL_MAP2_INDEX' : 1,
-        'GL_MAP2_NORMAL' : 1,
-        'GL_MAP2_TEXTURE_COORD_1' : 1,
-        'GL_MAP2_TEXTURE_COORD_2' : 1,
-        'GL_MAP2_TEXTURE_COORD_3' : 1,
-        'GL_MAP2_TEXTURE_COORD_4' : 1,
-        'GL_MAP2_VERTEX_3' : 1,
-        'GL_MAP2_VERTEX_4' : 1,
-        'GL_MAP_COLOR' : 1,
-        'GL_MAP_STENCIL' : 1,
-        'GL_MATRIX_MODE' : 1,
-        'GL_MAX_CLIENT_ATTRIB_STACK_DEPTH' : 1,
-        'GL_MAX_ATTRIB_STACK_DEPTH' : 1,
-        'GL_MAX_CLIP_PLANES' : 1,
-        'GL_MAX_COLOR_MATRIX_STACK_DEPTH' : 1,
-        'GL_MAX_EVAL_ORDER' : 1,
-        'GL_MAX_LIGHTS' : 1,
-        'GL_MAX_LIST_NESTING' : 1,
-        'GL_MAX_MODELVIEW_STACK_DEPTH' : 1,
-        'GL_MAX_NAME_STACK_DEPTH' : 1,
-        'GL_MAX_PIXEL_MAP_TABLE' : 1,
-        'GL_MAX_PROJECTION_STACK_DEPTH' : 1,
-        'GL_MAX_TEXTURE_SIZE' : 1,
-        'GL_MAX_3D_TEXTURE_SIZE' : 1,
-        'GL_MAX_TEXTURE_STACK_DEPTH' : 1,
-        'GL_MAX_VIEWPORT_DIMS': 2, 
-        'GL_MODELVIEW_MATRIX': 16,
-        'GL_MODELVIEW_STACK_DEPTH' : 1,
-        'GL_NAME_STACK_DEPTH' : 1,
-        'GL_NORMAL_ARRAY' : 1,
-        'GL_NORMAL_ARRAY_STRIDE' : 1,
-        'GL_NORMAL_ARRAY_TYPE' : 1,
-        'GL_NORMALIZE' : 1,
-        'GL_PACK_ALIGNMENT' : 1,
-        'GL_PACK_LSB_FIRST' : 1,
-        'GL_PACK_ROW_LENGTH' : 1,
-        'GL_PACK_SKIP_PIXELS' : 1,
-        'GL_PACK_SKIP_ROWS' : 1,
-        'GL_PACK_SWAP_BYTES' : 1,
-        'GL_PERSPECTIVE_CORRECTION_HINT' : 1,
-        'GL_PIXEL_MAP_A_TO_A_SIZE' : 1,
-        'GL_PIXEL_MAP_B_TO_B_SIZE' : 1,
-        'GL_PIXEL_MAP_G_TO_G_SIZE' : 1,
-        'GL_PIXEL_MAP_I_TO_A_SIZE' : 1,
-        'GL_PIXEL_MAP_I_TO_B_SIZE' : 1,
-        'GL_PIXEL_MAP_I_TO_G_SIZE' : 1,
-        'GL_PIXEL_MAP_I_TO_I_SIZE' : 1,
-        'GL_PIXEL_MAP_I_TO_R_SIZE' : 1,
-        'GL_PIXEL_MAP_R_TO_R_SIZE' : 1,
-        'GL_PIXEL_MAP_S_TO_S_SIZE' : 1,
-        'GL_POINT_SIZE' : 1,
-        'GL_POINT_SIZE_GRANULARITY' : 1,
-        'GL_POINT_SIZE_RANGE': 2, 
-        'GL_POINT_SMOOTH' : 1,
-        'GL_POINT_SMOOTH_HINT' : 1,
-        'GL_POLYGON_MODE': 2, 
-        'GL_POLYGON_OFFSET_FACTOR' : 1,
-        'GL_POLYGON_OFFSET_UNITS' : 1,
-        'GL_POLYGON_OFFSET_FILL' : 1,
-        'GL_POLYGON_OFFSET_LINE' : 1,
-        'GL_POLYGON_OFFSET_POINT' : 1,
-        'GL_POLYGON_SMOOTH' : 1,
-        'GL_POLYGON_SMOOTH_HINT' : 1,
-        'GL_POLYGON_STIPPLE' : 1,
-        'GL_PROJECTION_MATRIX': 16,
-        'GL_PROJECTION_STACK_DEPTH' : 1,
-        'GL_READ_BUFFER' : 1,
-        'GL_RED_BIAS' : 1,
-        'GL_RED_BITS' : 1,
-        'GL_RED_SCALE' : 1,
-        'GL_RENDER_MODE' : 1,
-        'GL_RGBA_MODE' : 1,
-        'GL_SCISSOR_BOX': 4,
-        'GL_SCISSOR_TEST' : 1,
-        'GL_SELECTION_BUFFER_SIZE' : 1,
-        'GL_SHADE_MODEL' : 1,
-        'GL_STENCIL_BITS' : 1,
-        'GL_STENCIL_CLEAR_VALUE' : 1,
-        'GL_STENCIL_FAIL' : 1,
-        'GL_STENCIL_FUNC' : 1,
-        'GL_STENCIL_PASS_DEPTH_FAIL' : 1,
-        'GL_STENCIL_PASS_DEPTH_PASS' : 1,
-        'GL_STENCIL_REF' : 1,
-        'GL_STENCIL_TEST' : 1,
-        'GL_STENCIL_VALUE_MASK' : 1,
-        'GL_STENCIL_WRITEMASK' : 1,
-        'GL_STEREO' : 1,
-        'GL_SUBPIXEL_BITS' : 1,
-        'GL_TEXTURE_1D' : 1,
-        'GL_TEXTURE_2D' : 1,
-        'GL_TEXTURE_BINDING_1D' : 1,
-        'GL_TEXTURE_BINDING_2D' : 1,
-        'GL_TEXTURE_BINDING_3D' : 1,
-        'GL_TEXTURE_COORD_ARRAY' : 1,
-        'GL_TEXTURE_COORD_ARRAY_SIZE' : 1,
-        'GL_TEXTURE_COORD_ARRAY_STRIDE' : 1,
-        'GL_TEXTURE_COORD_ARRAY_TYPE' : 1,
-        'GL_TEXTURE_ENV_COLOR': 4,
-        'GL_TEXTURE_ENV_MODE' : 1,
-        'GL_TEXTURE_GEN_Q' : 1,
-        'GL_TEXTURE_GEN_R' : 1,
-        'GL_TEXTURE_GEN_S' : 1,
-        'GL_TEXTURE_GEN_T' : 1,
-        'GL_TEXTURE_MATRIX': 16,
-        'GL_TEXTURE_STACK_DEPTH' : 1,
-        'GL_UNPACK_ALIGNMENT' : 1,
-        'GL_UNPACK_LSB_FIRST' : 1,
-        'GL_UNPACK_ROW_LENGTH' : 1,
-        'GL_UNPACK_SKIP_PIXELS' : 1,
-        'GL_UNPACK_SKIP_ROWS' : 1,
-        'GL_UNPACK_SWAP_BYTES' : 1,
-        'GL_VERTEX_ARRAY' : 1,
-        'GL_VERTEX_ARRAY_SIZE' : 1,
-        'GL_VERTEX_ARRAY_STRIDE' : 1,
-        'GL_VERTEX_ARRAY_TYPE' : 1,
-        'GL_VIEWPORT': 4,
-        'GL_ZOOM_X' : 1,
-        'GL_ZOOM_Y' : 1,
+    'GL_ACCUM_ALPHA_BITS' : 1,
+    'GL_ACCUM_BLUE_BITS' : 1,
+    'GL_ACCUM_CLEAR_VALUE': 4,
+    'GL_ACCUM_GREEN_BITS' : 1,
+    'GL_ACCUM_RED_BITS' : 1,
+    'GL_ALPHA_BIAS' : 1,
+    'GL_ALPHA_BITS' : 1,
+    'GL_ALPHA_SCALE' : 1,
+    'GL_ALPHA_TEST' : 1,
+    'GL_ALPHA_TEST_FUNC' : 1,
+    'GL_ALPHA_TEST_REF' : 1,
+    'GL_ATTRIB_STACK_DEPTH' : 1,
+    'GL_AUTO_NORMAL' : 1,
+    'GL_AUX_BUFFERS' : 1,
+    'GL_BLEND' : 1,
+    'GL_BLEND_DST' : 1,
+    'GL_BLEND_SRC' : 1,
+    'GL_BLUE_BIAS' : 1,
+    'GL_BLUE_BITS' : 1,
+    'GL_BLUE_SCALE' : 1,
+    'GL_CLIENT_ATTRIB_STACK_DEPTH' : 1,
+    'GL_CLIP_PLANE0' : 1,
+    'GL_CLIP_PLANE1' : 1,
+    'GL_CLIP_PLANE2' : 1,
+    'GL_CLIP_PLANE3' : 1,
+    'GL_CLIP_PLANE4' : 1,
+    'GL_CLIP_PLANE5' : 1,
+    'GL_COLOR_ARRAY' : 1,
+    'GL_COLOR_ARRAY_SIZE' : 1,
+    'GL_COLOR_ARRAY_STRIDE' : 1,
+    'GL_COLOR_ARRAY_TYPE' : 1,
+    'GL_COLOR_CLEAR_VALUE': 4,
+    'GL_COLOR_LOGIC_OP' : 1,
+    'GL_COLOR_MATERIAL' : 1,
+    'GL_COLOR_MATERIAL_FACE' : 1,
+    'GL_COLOR_MATERIAL_PARAMETER' : 1,
+    'GL_COLOR_MATRIX_STACK_DEPTH' : 1,
+    'GL_COLOR_WRITEMASK': 4,
+    'GL_CULL_FACE' : 1,
+    'GL_CULL_FACE_MODE' : 1,
+    'GL_CURRENT_COLOR': 4,
+    'GL_CURRENT_INDEX' : 1,
+    'GL_CURRENT_NORMAL': 3,
+    'GL_CURRENT_RASTER_COLOR': 4,
+    'GL_CURRENT_RASTER_DISTANCE' : 1,
+    'GL_CURRENT_RASTER_INDEX' : 1,
+    'GL_CURRENT_RASTER_POSITION': 4,
+    'GL_CURRENT_RASTER_POSITION_VALID' : 1,
+    'GL_CURRENT_RASTER_TEXTURE_COORDS': 4,
+    'GL_CURRENT_TEXTURE_COORDS': 4,
+    'GL_DEPTH_BIAS' : 1,
+    'GL_DEPTH_BITS' : 1,
+    'GL_DEPTH_CLEAR_VALUE' : 1,
+    'GL_DEPTH_FUNC' : 1,
+    'GL_DEPTH_RANGE': 2,
+    'GL_DEPTH_SCALE' : 1,
+    'GL_DEPTH_TEST' : 1,
+    'GL_DEPTH_WRITEMASK' : 1,
+    'GL_DITHER' : 1,
+    'GL_DOUBLEBUFFER' : 1,
+    'GL_DRAW_BUFFER' : 1,
+    'GL_EDGE_FLAG' : 1,
+    'GL_EDGE_FLAG_ARRAY' : 1,
+    'GL_EDGE_FLAG_ARRAY_STRIDE' : 1,
+    'GL_FEEDBACK_BUFFER_SIZE' : 1,
+    'GL_FEEDBACK_BUFFER_TYPE' : 1,
+    'GL_FOG' : 1,
+    'GL_FOG_COLOR': 4,
+    'GL_FOG_DENSITY' : 1,
+    'GL_FOG_END' : 1,
+    'GL_FOG_HINT' : 1,
+    'GL_FOG_INDEX' : 1,
+    'GL_FOG_MODE' : 1,
+    'GL_FOG_START' : 1,
+    'GL_FRONT_FACE' : 1,
+    'GL_GREEN_BIAS' : 1,
+    'GL_GREEN_BITS' : 1,
+    'GL_GREEN_SCALE' : 1,
+    'GL_INDEX_ARRAY' : 1,
+    'GL_INDEX_ARRAY_STRIDE' : 1,
+    'GL_INDEX_ARRAY_TYPE' : 1,
+    'GL_INDEX_BITS' : 1,
+    'GL_INDEX_CLEAR_VALUE' : 1,
+    'GL_INDEX_LOGIC_OP' : 1,
+    'GL_INDEX_MODE' : 1,
+    'GL_INDEX_OFFSET' : 1,
+    'GL_INDEX_SHIFT' : 1,
+    'GL_INDEX_WRITEMASK' : 1,
+    'GL_LIGHT0' : 1,
+    'GL_LIGHT1' : 1,
+    'GL_LIGHT2' : 1,
+    'GL_LIGHT3' : 1,
+    'GL_LIGHT4' : 1,
+    'GL_LIGHT5' : 1,
+    'GL_LIGHT6' : 1,
+    'GL_LIGHT7' : 1,
+    'GL_LIGHTING' : 1,
+    'GL_LIGHT_MODEL_AMBIENT': 4,
+    'GL_LIGHT_MODEL_LOCAL_VIEWER' : 1,
+    'GL_LIGHT_MODEL_TWO_SIDE' : 1,
+    'GL_LINE_SMOOTH' : 1,
+    'GL_LINE_SMOOTH_HINT' : 1,
+    'GL_LINE_STIPPLE' : 1,
+    'GL_LINE_STIPPLE_PATTERN' : 1,
+    'GL_LINE_STIPPLE_REPEAT' : 1,
+    'GL_LINE_WIDTH' : 1,
+    'GL_LINE_WIDTH_GRANULARITY' : 1,
+    'GL_LINE_WIDTH_RANGE': 2, 
+    'GL_LIST_BASE' : 1,
+    'GL_LIST_INDEX' : 1,
+    'GL_LIST_MODE' : 1,
+    'GL_LOGIC_OP_MODE' : 1,
+    'GL_MAP1_COLOR_4' : 1,
+    'GL_MAP1_GRID_DOMAIN': 2, 
+    'GL_MAP1_GRID_SEGMENTS' : 1,
+    'GL_MAP1_INDEX' : 1,
+    'GL_MAP1_NORMAL' : 1,
+    'GL_MAP1_TEXTURE_COORD_1' : 1,
+    'GL_MAP1_TEXTURE_COORD_2' : 1,
+    'GL_MAP1_TEXTURE_COORD_3' : 1,
+    'GL_MAP1_TEXTURE_COORD_4' : 1,
+    'GL_MAP1_VERTEX_3' : 1,
+    'GL_MAP1_VERTEX_4' : 1,
+    'GL_MAP2_COLOR_4' : 1,
+    'GL_MAP2_GRID_DOMAIN': 4,
+    'GL_MAP2_GRID_SEGMENTS': 2, 
+    'GL_MAP2_INDEX' : 1,
+    'GL_MAP2_NORMAL' : 1,
+    'GL_MAP2_TEXTURE_COORD_1' : 1,
+    'GL_MAP2_TEXTURE_COORD_2' : 1,
+    'GL_MAP2_TEXTURE_COORD_3' : 1,
+    'GL_MAP2_TEXTURE_COORD_4' : 1,
+    'GL_MAP2_VERTEX_3' : 1,
+    'GL_MAP2_VERTEX_4' : 1,
+    'GL_MAP_COLOR' : 1,
+    'GL_MAP_STENCIL' : 1,
+    'GL_MATRIX_MODE' : 1,
+    'GL_MAX_CLIENT_ATTRIB_STACK_DEPTH' : 1,
+    'GL_MAX_ATTRIB_STACK_DEPTH' : 1,
+    'GL_MAX_CLIP_PLANES' : 1,
+    'GL_MAX_COLOR_MATRIX_STACK_DEPTH' : 1,
+    'GL_MAX_EVAL_ORDER' : 1,
+    'GL_MAX_LIGHTS' : 1,
+    'GL_MAX_LIST_NESTING' : 1,
+    'GL_MAX_MODELVIEW_STACK_DEPTH' : 1,
+    'GL_MAX_NAME_STACK_DEPTH' : 1,
+    'GL_MAX_PIXEL_MAP_TABLE' : 1,
+    'GL_MAX_PROJECTION_STACK_DEPTH' : 1,
+    'GL_MAX_TEXTURE_SIZE' : 1,
+    'GL_MAX_3D_TEXTURE_SIZE' : 1,
+    'GL_MAX_TEXTURE_STACK_DEPTH' : 1,
+    'GL_MAX_VIEWPORT_DIMS': 2, 
+    'GL_MODELVIEW_MATRIX': 16,
+    'GL_MODELVIEW_STACK_DEPTH' : 1,
+    'GL_NAME_STACK_DEPTH' : 1,
+    'GL_NORMAL_ARRAY' : 1,
+    'GL_NORMAL_ARRAY_STRIDE' : 1,
+    'GL_NORMAL_ARRAY_TYPE' : 1,
+    'GL_NORMALIZE' : 1,
+    'GL_PACK_ALIGNMENT' : 1,
+    'GL_PACK_LSB_FIRST' : 1,
+    'GL_PACK_ROW_LENGTH' : 1,
+    'GL_PACK_SKIP_PIXELS' : 1,
+    'GL_PACK_SKIP_ROWS' : 1,
+    'GL_PACK_SWAP_BYTES' : 1,
+    'GL_PERSPECTIVE_CORRECTION_HINT' : 1,
+    'GL_PIXEL_MAP_A_TO_A_SIZE' : 1,
+    'GL_PIXEL_MAP_B_TO_B_SIZE' : 1,
+    'GL_PIXEL_MAP_G_TO_G_SIZE' : 1,
+    'GL_PIXEL_MAP_I_TO_A_SIZE' : 1,
+    'GL_PIXEL_MAP_I_TO_B_SIZE' : 1,
+    'GL_PIXEL_MAP_I_TO_G_SIZE' : 1,
+    'GL_PIXEL_MAP_I_TO_I_SIZE' : 1,
+    'GL_PIXEL_MAP_I_TO_R_SIZE' : 1,
+    'GL_PIXEL_MAP_R_TO_R_SIZE' : 1,
+    'GL_PIXEL_MAP_S_TO_S_SIZE' : 1,
+    'GL_POINT_SIZE' : 1,
+    'GL_POINT_SIZE_GRANULARITY' : 1,
+    'GL_POINT_SIZE_RANGE': 2, 
+    'GL_POINT_SMOOTH' : 1,
+    'GL_POINT_SMOOTH_HINT' : 1,
+    'GL_POLYGON_MODE': 2, 
+    'GL_POLYGON_OFFSET_FACTOR' : 1,
+    'GL_POLYGON_OFFSET_UNITS' : 1,
+    'GL_POLYGON_OFFSET_FILL' : 1,
+    'GL_POLYGON_OFFSET_LINE' : 1,
+    'GL_POLYGON_OFFSET_POINT' : 1,
+    'GL_POLYGON_SMOOTH' : 1,
+    'GL_POLYGON_SMOOTH_HINT' : 1,
+    'GL_POLYGON_STIPPLE' : 1,
+    'GL_PROJECTION_MATRIX': 16,
+    'GL_PROJECTION_STACK_DEPTH' : 1,
+    'GL_READ_BUFFER' : 1,
+    'GL_RED_BIAS' : 1,
+    'GL_RED_BITS' : 1,
+    'GL_RED_SCALE' : 1,
+    'GL_RENDER_MODE' : 1,
+    'GL_RGBA_MODE' : 1,
+    'GL_SCISSOR_BOX': 4,
+    'GL_SCISSOR_TEST' : 1,
+    'GL_SELECTION_BUFFER_SIZE' : 1,
+    'GL_SHADE_MODEL' : 1,
+    'GL_STENCIL_BITS' : 1,
+    'GL_STENCIL_CLEAR_VALUE' : 1,
+    'GL_STENCIL_FAIL' : 1,
+    'GL_STENCIL_FUNC' : 1,
+    'GL_STENCIL_PASS_DEPTH_FAIL' : 1,
+    'GL_STENCIL_PASS_DEPTH_PASS' : 1,
+    'GL_STENCIL_REF' : 1,
+    'GL_STENCIL_TEST' : 1,
+    'GL_STENCIL_VALUE_MASK' : 1,
+    'GL_STENCIL_WRITEMASK' : 1,
+    'GL_STEREO' : 1,
+    'GL_SUBPIXEL_BITS' : 1,
+    'GL_TEXTURE_1D' : 1,
+    'GL_TEXTURE_2D' : 1,
+    'GL_TEXTURE_BINDING_1D' : 1,
+    'GL_TEXTURE_BINDING_2D' : 1,
+    'GL_TEXTURE_BINDING_3D' : 1,
+    'GL_TEXTURE_COORD_ARRAY' : 1,
+    'GL_TEXTURE_COORD_ARRAY_SIZE' : 1,
+    'GL_TEXTURE_COORD_ARRAY_STRIDE' : 1,
+    'GL_TEXTURE_COORD_ARRAY_TYPE' : 1,
+    'GL_TEXTURE_ENV_COLOR': 4,
+    'GL_TEXTURE_ENV_MODE' : 1,
+    'GL_TEXTURE_GEN_Q' : 1,
+    'GL_TEXTURE_GEN_R' : 1,
+    'GL_TEXTURE_GEN_S' : 1,
+    'GL_TEXTURE_GEN_T' : 1,
+    'GL_TEXTURE_MATRIX': 16,
+    'GL_TEXTURE_STACK_DEPTH' : 1,
+    'GL_UNPACK_ALIGNMENT' : 1,
+    'GL_UNPACK_LSB_FIRST' : 1,
+    'GL_UNPACK_ROW_LENGTH' : 1,
+    'GL_UNPACK_SKIP_PIXELS' : 1,
+    'GL_UNPACK_SKIP_ROWS' : 1,
+    'GL_UNPACK_SWAP_BYTES' : 1,
+    'GL_VERTEX_ARRAY' : 1,
+    'GL_VERTEX_ARRAY_SIZE' : 1,
+    'GL_VERTEX_ARRAY_STRIDE' : 1,
+    'GL_VERTEX_ARRAY_TYPE' : 1,
+    'GL_VIEWPORT': 4,
+    'GL_ZOOM_X' : 1,
+    'GL_ZOOM_Y' : 1,
 }
 
 extensions_num_get_values = {
-        'GL_BLEND_COLOR_EXT': (4, 'CR_EXT_blend_color'),
-        'GL_BLEND_EQUATION_EXT': (1, 'CR_EXT_blend_minmax'),
-        'GL_BLEND_SRC_RGB_EXT': (1, 'CR_EXT_blend_func_separate'),
-        'GL_BLEND_DST_RGB_EXT': (1, 'CR_EXT_blend_func_separate'),
-        'GL_BLEND_SRC_ALPHA_EXT': (1, 'CR_EXT_blend_func_separate'),
-        'GL_BLEND_DST_ALPHA_EXT': (1, 'CR_EXT_blend_func_separate'),
-        'GL_FOG_DISTANCE_MODE_NV': (1, 'CR_NV_fog_distance'),
-        'GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB': (1, 'CR_ARB_texture_cube_map'),
-        'GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT': (1, 'CR_EXT_texture_filter_anisotropic'),
-        'GL_TEXTURE_BINDING_CUBE_MAP_ARB': (1, 'CR_ARB_texture_cube_map'),
-        'GL_TEXTURE_CUBE_MAP_ARB': (1, 'CR_ARB_texture_cube_map'),
-        'GL_ACTIVE_TEXTURE_ARB': (1, 'CR_ARB_multitexture'),
-        'GL_CLIENT_ACTIVE_TEXTURE_ARB': (1, 'CR_ARB_multitexture'),
-        'GL_MAX_TEXTURE_UNITS_ARB': (1, 'CR_ARB_multitexture'),
-        'GL_NUM_GENERAL_COMBINERS_NV': (1, 'CR_NV_register_combiners'),
-        'GL_MAX_GENERAL_COMBINERS_NV': (1, 'CR_NV_register_combiners'),
-        'GL_COLOR_SUM_CLAMP_NV': (1, 'CR_NV_register_combiners'),
-        'GL_CONSTANT_COLOR0_NV': (4, 'CR_NV_register_combiners'),
-        'GL_CONSTANT_COLOR1_NV': (4, 'CR_NV_register_combiners'),
-        'GL_PER_STAGE_CONSTANTS_NV': (1, 'CR_NV_register_combiners2'),
-        'GL_LIGHT_MODEL_COLOR_CONTROL_EXT': (1, 'CR_EXT_separate_specular_color'),
-        'GL_COLOR_SUM_EXT': (1, 'CR_EXT_secondary_color'),
-        'GL_CURRENT_SECONDARY_COLOR_EXT': (4, 'CR_EXT_secondary_color'),
-        'GL_SECONDARY_COLOR_ARRAY_SIZE_EXT': (1, 'CR_EXT_secondary_color'),
-        'GL_SECONDARY_COLOR_ARRAY_TYPE_EXT': (1, 'CR_EXT_secondary_color'),
-        'GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT': (1, 'CR_EXT_secondary_color'),
-        'GL_RESCALE_NORMAL': (1, 'CR_OPENGL_VERSION_1_2'),
-        'GL_NUM_COMPRESSED_TEXTURE_FORMATS': (1, 'CR_ARB_texture_compression'),
-        'GL_TEXTURE_3D': (1, 'CR_OPENGL_VERSION_1_2'),
-        'GL_LIGHT_MODEL_COLOR_CONTROL': (1, 'CR_OPENGL_VERSION_1_2'),
-        'GL_UNPACK_IMAGE_HEIGHT': (1, 'CR_OPENGL_VERSION_1_2'),
-        'GL_UNPACK_SKIP_IMAGES': (1, 'CR_OPENGL_VERSION_1_2'),
-        'GL_PACK_IMAGE_HEIGHT': (1, 'CR_OPENGL_VERSION_1_2'),
-        'GL_PACK_SKIP_IMAGES': (1, 'CR_OPENGL_VERSION_1_2'),
-        'GL_ALIASED_POINT_SIZE_RANGE': (2, 'CR_OPENGL_VERSION_1_2'),
-        'GL_ALIASED_LINE_WIDTH_RANGE': (2, 'CR_OPENGL_VERSION_1_2'),
-        'GL_MAX_ELEMENTS_INDICES': (1, 'CR_OPENGL_VERSION_1_2'),
-        'GL_MAX_ELEMENTS_VERTICES': (1, 'CR_OPENGL_VERSION_1_2'),
-        'GL_MULTISAMPLE_ARB': (1, 'CR_ARB_multisample'),
-        'GL_SAMPLE_ALPHA_TO_COVERAGE_ARB': (1, 'CR_ARB_multisample'),
-        'GL_SAMPLE_ALPHA_TO_ONE_ARB': (1, 'CR_ARB_multisample'),
-        'GL_SAMPLE_COVERAGE_ARB': (1, 'CR_ARB_multisample'),
-        'GL_SAMPLE_BUFFERS_ARB': (1, 'CR_ARB_multisample'),
-        'GL_SAMPLES_ARB': (1, 'CR_ARB_multisample'),
-        'GL_SAMPLE_COVERAGE_VALUE_ARB': (1, 'CR_ARB_multisample'),
-        'GL_SAMPLE_COVERAGE_INVERT_ARB': (1, 'CR_ARB_multisample'),
-        'GL_POINT_SPRITE_ARB': (1, 'CR_ARB_point_sprite'),
-        'GL_MAX_TEXTURE_LOD_BIAS_EXT': (1, 'CR_EXT_texture_lod_bias'),
-        'GL_COMPRESSED_TEXTURE_FORMATS_ARB': (1, 'CR_ARB_texture_compression'),
-        'GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB': (1, 'CR_ARB_texture_compression'),
-        'GL_PROGRAM_ERROR_POSITION_NV': (1, 'CR_NV_vertex_program'),
-        'GL_VERTEX_PROGRAM_BINDING_NV': (1, 'CR_NV_vertex_program'),
-        'GL_MAX_VERTEX_ATTRIBS_ARB': (1, 'CR_ARB_vertex_program'),
-        'GL_PROGRAM_ERROR_POSITION_NV': (1, 'CR_NV_fragment_program'),
-        'GL_FRAGMENT_PROGRAM_BINDING_NV': (1, 'CR_NV_fragment_program'),
-        'GL_MAX_RECTANGLE_TEXTURE_SIZE_NV': (1, 'CR_NV_texture_rectangle'),
-        'GL_TEXTURE_RECTANGLE_NV': (1, 'CR_NV_texture_rectangle'),
-        'GL_TEXTURE_BINDING_RECTANGLE_NV': (1, 'CR_NV_texture_rectangle'),
-        'GL_CLIP_VOLUME_CLIPPING_HINT_EXT' : (3, 'CR_EXT_clip_volume_hint'),
-        'GL_RASTER_POSITION_UNCLIPPED_IBM' : (1, 'CR_IBM_rasterpos_clip'),
-        'GL_GENERATE_MIPMAP_HINT_SGIS' : (1, 'CR_SGIS_generate_mipmap'),
-        'GL_CURRENT_FOG_COORDINATE_EXT' : (1, 'CR_EXT_fog_coord'),
-        'GL_FOG_COORDINATE_ARRAY_TYPE_EXT' : (1, 'CR_EXT_fog_coord'),
-        'GL_FOG_COORDINATE_ARRAY_STRIDE_EXT' : (1, 'CR_EXT_fog_coord'),
-        'GL_TRANSPOSE_COLOR_MATRIX_ARB': (16, 'CR_ARB_transpose_matrix'),
-        'GL_TRANSPOSE_MODELVIEW_MATRIX_ARB': (16, 'CR_ARB_transpose_matrix'),
-        'GL_TRANSPOSE_PROJECTION_MATRIX_ARB': (16, 'CR_ARB_transpose_matrix'),
-        'GL_TRANSPOSE_TEXTURE_MATRIX_ARB': (16, 'CR_ARB_transpose_matrix'),
-        'GL_ARRAY_BUFFER_BINDING_ARB': (1, 'CR_ARB_vertex_buffer_object'),
-        'GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB': (1, 'CR_ARB_vertex_buffer_object'),
-        'GL_VERTEX_ARRAY_BUFFER_BINDING_ARB': (1, 'CR_ARB_vertex_buffer_object'),
-        'GL_NORMAL_ARRAY_BUFFER_BINDING_ARB': (1, 'CR_ARB_vertex_buffer_object'),
-        'GL_COLOR_ARRAY_BUFFER_BINDING_ARB': (1, 'CR_ARB_vertex_buffer_object'),
-        'GL_INDEX_ARRAY_BUFFER_BINDING_ARB': (1, 'CR_ARB_vertex_buffer_object'),
-        'GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB': (1, 'CR_ARB_vertex_buffer_object'),
-        'GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB': (1, 'CR_ARB_vertex_buffer_object'),
-        'GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB': (1, 'CR_ARB_vertex_buffer_object'),
-        'GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB': (1, 'CR_ARB_vertex_buffer_object'),
-        'GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB': (1, 'CR_ARB_vertex_buffer_object'),
-        'GL_MAX_TEXTURE_IMAGE_UNITS_ARB': (1, 'CR_ARB_fragment_program'),
+    'GL_BLEND_COLOR_EXT': (4, 'CR_EXT_blend_color'),
+    'GL_BLEND_EQUATION_EXT': (1, 'CR_EXT_blend_minmax'),
+    'GL_BLEND_SRC_RGB_EXT': (1, 'CR_EXT_blend_func_separate'),
+    'GL_BLEND_DST_RGB_EXT': (1, 'CR_EXT_blend_func_separate'),
+    'GL_BLEND_SRC_ALPHA_EXT': (1, 'CR_EXT_blend_func_separate'),
+    'GL_BLEND_DST_ALPHA_EXT': (1, 'CR_EXT_blend_func_separate'),
+    'GL_FOG_DISTANCE_MODE_NV': (1, 'CR_NV_fog_distance'),
+    'GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB': (1, 'CR_ARB_texture_cube_map'),
+    'GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT': (1, 'CR_EXT_texture_filter_anisotropic'),
+    'GL_TEXTURE_BINDING_CUBE_MAP_ARB': (1, 'CR_ARB_texture_cube_map'),
+    'GL_TEXTURE_CUBE_MAP_ARB': (1, 'CR_ARB_texture_cube_map'),
+    'GL_ACTIVE_TEXTURE_ARB': (1, 'CR_ARB_multitexture'),
+    'GL_CLIENT_ACTIVE_TEXTURE_ARB': (1, 'CR_ARB_multitexture'),
+    'GL_MAX_TEXTURE_UNITS_ARB': (1, 'CR_ARB_multitexture'),
+    'GL_NUM_GENERAL_COMBINERS_NV': (1, 'CR_NV_register_combiners'),
+    'GL_MAX_GENERAL_COMBINERS_NV': (1, 'CR_NV_register_combiners'),
+    'GL_COLOR_SUM_CLAMP_NV': (1, 'CR_NV_register_combiners'),
+    'GL_CONSTANT_COLOR0_NV': (4, 'CR_NV_register_combiners'),
+    'GL_CONSTANT_COLOR1_NV': (4, 'CR_NV_register_combiners'),
+    'GL_PER_STAGE_CONSTANTS_NV': (1, 'CR_NV_register_combiners2'),
+    'GL_LIGHT_MODEL_COLOR_CONTROL_EXT': (1, 'CR_EXT_separate_specular_color'),
+    'GL_COLOR_SUM_EXT': (1, 'CR_EXT_secondary_color'),
+    'GL_CURRENT_SECONDARY_COLOR_EXT': (4, 'CR_EXT_secondary_color'),
+    'GL_SECONDARY_COLOR_ARRAY_SIZE_EXT': (1, 'CR_EXT_secondary_color'),
+    'GL_SECONDARY_COLOR_ARRAY_TYPE_EXT': (1, 'CR_EXT_secondary_color'),
+    'GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT': (1, 'CR_EXT_secondary_color'),
+    'GL_RESCALE_NORMAL': (1, 'CR_OPENGL_VERSION_1_2'),
+    'GL_NUM_COMPRESSED_TEXTURE_FORMATS': (1, 'CR_ARB_texture_compression'),
+    'GL_TEXTURE_3D': (1, 'CR_OPENGL_VERSION_1_2'),
+    'GL_LIGHT_MODEL_COLOR_CONTROL': (1, 'CR_OPENGL_VERSION_1_2'),
+    'GL_UNPACK_IMAGE_HEIGHT': (1, 'CR_OPENGL_VERSION_1_2'),
+    'GL_UNPACK_SKIP_IMAGES': (1, 'CR_OPENGL_VERSION_1_2'),
+    'GL_PACK_IMAGE_HEIGHT': (1, 'CR_OPENGL_VERSION_1_2'),
+    'GL_PACK_SKIP_IMAGES': (1, 'CR_OPENGL_VERSION_1_2'),
+    'GL_ALIASED_POINT_SIZE_RANGE': (2, 'CR_OPENGL_VERSION_1_2'),
+    'GL_ALIASED_LINE_WIDTH_RANGE': (2, 'CR_OPENGL_VERSION_1_2'),
+    'GL_MAX_ELEMENTS_INDICES': (1, 'CR_OPENGL_VERSION_1_2'),
+    'GL_MAX_ELEMENTS_VERTICES': (1, 'CR_OPENGL_VERSION_1_2'),
+    'GL_MULTISAMPLE_ARB': (1, 'CR_ARB_multisample'),
+    'GL_SAMPLE_ALPHA_TO_COVERAGE_ARB': (1, 'CR_ARB_multisample'),
+    'GL_SAMPLE_ALPHA_TO_ONE_ARB': (1, 'CR_ARB_multisample'),
+    'GL_SAMPLE_COVERAGE_ARB': (1, 'CR_ARB_multisample'),
+    'GL_SAMPLE_BUFFERS_ARB': (1, 'CR_ARB_multisample'),
+    'GL_SAMPLES_ARB': (1, 'CR_ARB_multisample'),
+    'GL_SAMPLE_COVERAGE_VALUE_ARB': (1, 'CR_ARB_multisample'),
+    'GL_SAMPLE_COVERAGE_INVERT_ARB': (1, 'CR_ARB_multisample'),
+    'GL_POINT_SPRITE_ARB': (1, 'CR_ARB_point_sprite'),
+    'GL_MAX_TEXTURE_LOD_BIAS_EXT': (1, 'CR_EXT_texture_lod_bias'),
+    'GL_COMPRESSED_TEXTURE_FORMATS_ARB': (1, 'CR_ARB_texture_compression'),
+    'GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB': (1, 'CR_ARB_texture_compression'),
+    'GL_PROGRAM_ERROR_POSITION_NV': (1, 'CR_NV_vertex_program'),
+    'GL_VERTEX_PROGRAM_BINDING_NV': (1, 'CR_NV_vertex_program'),
+    'GL_MAX_VERTEX_ATTRIBS_ARB': (1, 'CR_ARB_vertex_program'),
+    'GL_PROGRAM_ERROR_POSITION_NV': (1, 'CR_NV_fragment_program'),
+    'GL_FRAGMENT_PROGRAM_BINDING_NV': (1, 'CR_NV_fragment_program'),
+    'GL_MAX_RECTANGLE_TEXTURE_SIZE_NV': (1, 'CR_NV_texture_rectangle'),
+    'GL_TEXTURE_RECTANGLE_NV': (1, 'CR_NV_texture_rectangle'),
+    'GL_TEXTURE_BINDING_RECTANGLE_NV': (1, 'CR_NV_texture_rectangle'),
+    'GL_CLIP_VOLUME_CLIPPING_HINT_EXT' : (3, 'CR_EXT_clip_volume_hint'),
+    'GL_RASTER_POSITION_UNCLIPPED_IBM' : (1, 'CR_IBM_rasterpos_clip'),
+    'GL_GENERATE_MIPMAP_HINT_SGIS' : (1, 'CR_SGIS_generate_mipmap'),
+    'GL_CURRENT_FOG_COORDINATE_EXT' : (1, 'CR_EXT_fog_coord'),
+    'GL_FOG_COORDINATE_ARRAY_TYPE_EXT' : (1, 'CR_EXT_fog_coord'),
+    'GL_FOG_COORDINATE_ARRAY_STRIDE_EXT' : (1, 'CR_EXT_fog_coord'),
+    'GL_TRANSPOSE_COLOR_MATRIX_ARB': (16, 'CR_ARB_transpose_matrix'),
+    'GL_TRANSPOSE_MODELVIEW_MATRIX_ARB': (16, 'CR_ARB_transpose_matrix'),
+    'GL_TRANSPOSE_PROJECTION_MATRIX_ARB': (16, 'CR_ARB_transpose_matrix'),
+    'GL_TRANSPOSE_TEXTURE_MATRIX_ARB': (16, 'CR_ARB_transpose_matrix'),
+    'GL_ARRAY_BUFFER_BINDING_ARB': (1, 'CR_ARB_vertex_buffer_object'),
+    'GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB': (1, 'CR_ARB_vertex_buffer_object'),
+    'GL_VERTEX_ARRAY_BUFFER_BINDING_ARB': (1, 'CR_ARB_vertex_buffer_object'),
+    'GL_NORMAL_ARRAY_BUFFER_BINDING_ARB': (1, 'CR_ARB_vertex_buffer_object'),
+    'GL_COLOR_ARRAY_BUFFER_BINDING_ARB': (1, 'CR_ARB_vertex_buffer_object'),
+    'GL_INDEX_ARRAY_BUFFER_BINDING_ARB': (1, 'CR_ARB_vertex_buffer_object'),
+    'GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB': (1, 'CR_ARB_vertex_buffer_object'),
+    'GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB': (1, 'CR_ARB_vertex_buffer_object'),
+    'GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB': (1, 'CR_ARB_vertex_buffer_object'),
+    'GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB': (1, 'CR_ARB_vertex_buffer_object'),
+    'GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB': (1, 'CR_ARB_vertex_buffer_object'),
+    'GL_MAX_TEXTURE_IMAGE_UNITS_ARB': (1, 'CR_ARB_fragment_program'),
 }
 
@@ -340 +340 @@
 print "struct nv_struct { GLenum pname; unsigned int num_values; } num_values_array[] = {"
 for key in get_keys:
-        try:
-                print '\t{ %s, %d },' % (key, num_get_values[key])
-        except KeyError:
-                (nv, ifdef) = extensions_num_get_values[key]
-                print '#ifdef %s' % ifdef
-                print '\t{ %s, %d },' % (key, nv)
-                print '#endif /* %s */' % ifdef
+    try:
+        print '\t{ %s, %d },' % (key, num_get_values[key])
+    except KeyError:
+        (nv, ifdef) = extensions_num_get_values[key]
+        print '#ifdef %s' % ifdef
+        print '\t{ %s, %d },' % (key, nv)
+        print '#endif /* %s */' % ifdef
 print "\t{ 0, 0 }"
 print "};"
@@ -353 +353 @@
 static unsigned int __numValues( GLenum pname )
 {
-        struct nv_struct *temp;
-        
-        for (temp = num_values_array; temp->num_values != 0 ; temp++)
-        {
-                if (temp->pname == pname)
-                        return temp->num_values;
-        }
-        crError( "Invalid pname to __numValues: 0x%x\\n", (int) pname );
-        return 0;
+    struct nv_struct *temp;
+    
+    for (temp = num_values_array; temp->num_values != 0 ; temp++)
+    {
+        if (temp->pname == pname)
+            return temp->num_values;
+    }
+    crError( "Invalid pname to __numValues: 0x%x\\n", (int) pname );
+    return 0;
 }
 """

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

@@ -115 +115 @@
 {
     int i, j;
-        int32_t pos;
+    int32_t pos;
 
     crDebug("Deleting client %p (%d msgs left)", client,