Index: /trunk/src/VBox/Additions/common/crOpenGL/pack/pack.py =================================================================== --- /trunk/src/VBox/Additions/common/crOpenGL/pack/pack.py (revision 20082) +++ /trunk/src/VBox/Additions/common/crOpenGL/pack/pack.py (revision 20083) @@ -30,6 +30,6 @@ static void __fillin( int offset, char *name, SPUGenericFunction func ) { - _cr_pack_table[offset].name = crStrdup( name ); - _cr_pack_table[offset].fn = func; + _cr_pack_table[offset].name = crStrdup( name ); + _cr_pack_table[offset].fn = func; }""" @@ -37,20 +37,20 @@ for func_name in keys: - if ("get" in apiutil.Properties(func_name) or - apiutil.FindSpecial( "packspu", func_name ) or - apiutil.FindSpecial( "packspu_flush", func_name ) or - apiutil.FindSpecial( "packspu_vertex", func_name )): - pack_specials.append( func_name ) + if ("get" in apiutil.Properties(func_name) or + apiutil.FindSpecial( "packspu", func_name ) or + apiutil.FindSpecial( "packspu_flush", func_name ) or + apiutil.FindSpecial( "packspu_vertex", func_name )): + pack_specials.append( func_name ) print '\nvoid packspuCreateFunctions( void )' print '{' for index in range(len(keys)): - func_name = keys[index] - if apiutil.FindSpecial( "packspu_unimplemented", func_name ): - continue - if func_name in pack_specials: - print '\t__fillin( %3d, "%s", (SPUGenericFunction) packspu_%s );' % (index, func_name, func_name ) - else: - print '\t__fillin( %3d, "%s", (SPUGenericFunction) (pack_spu.swap ? crPack%sSWAP : crPack%s) );' % (index, func_name, func_name, func_name ) + func_name = keys[index] + if apiutil.FindSpecial( "packspu_unimplemented", func_name ): + continue + if func_name in pack_specials: + print '\t__fillin( %3d, "%s", (SPUGenericFunction) packspu_%s );' % (index, func_name, func_name ) + else: + print '\t__fillin( %3d, "%s", (SPUGenericFunction) (pack_spu.swap ? crPack%sSWAP : crPack%s) );' % (index, func_name, func_name, func_name ) print '\t__fillin( %3d, NULL, NULL );' % num_funcs print '}' Index: /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_beginend.py =================================================================== --- /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_beginend.py (revision 20082) +++ /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_beginend.py (revision 20083) @@ -19,119 +19,119 @@ void PACKSPU_APIENTRY packspu_Begin( GLenum mode ) { - GET_THREAD(thread); - CRPackBuffer *buf = &thread->BeginEndBuffer; + GET_THREAD(thread); + CRPackBuffer *buf = &thread->BeginEndBuffer; - /* XXX comparing mode >= 0 here is not needed since mode is unsigned */ - CRASSERT( mode >= GL_POINTS && mode <= GL_POLYGON ); + /* XXX comparing mode >= 0 here is not needed since mode is unsigned */ + CRASSERT( mode >= GL_POINTS && mode <= GL_POLYGON ); - if (pack_spu.swap) - { - crPackBeginSWAP( mode ); - } - else - { - crPackBegin( mode ); - } + if (pack_spu.swap) + { + crPackBeginSWAP( mode ); + } + else + { + crPackBegin( mode ); + } - if ( thread->netServer.conn->Barf ) { - thread->BeginEndMode = mode; - thread->BeginEndState = -1; - if ( mode == GL_LINES || mode == GL_TRIANGLES || mode == GL_QUADS || mode == GL_POLYGON ) - { - CRASSERT(!buf->pack); + if ( thread->netServer.conn->Barf ) { + thread->BeginEndMode = mode; + thread->BeginEndState = -1; + if ( mode == GL_LINES || mode == GL_TRIANGLES || mode == GL_QUADS || mode == GL_POLYGON ) + { + CRASSERT(!buf->pack); - crPackReleaseBuffer( thread->packer ); - buf->pack = crNetAlloc( thread->netServer.conn ); - crPackInitBuffer( buf, buf->pack, thread->netServer.conn->buffer_size, thread->netServer.conn->mtu ); - buf->holds_BeginEnd = 1; - buf->in_BeginEnd = 1; - crPackSetBuffer( thread->packer, buf ); + crPackReleaseBuffer( thread->packer ); + buf->pack = crNetAlloc( thread->netServer.conn ); + crPackInitBuffer( buf, buf->pack, thread->netServer.conn->buffer_size, thread->netServer.conn->mtu ); + buf->holds_BeginEnd = 1; + buf->in_BeginEnd = 1; + crPackSetBuffer( thread->packer, buf ); - thread->BeginEndState = 0; - } - } + thread->BeginEndState = 0; + } + } } void PACKSPU_APIENTRY packspu_End( void ) { - GET_THREAD(thread); - CRPackBuffer *buf = &thread->BeginEndBuffer; + GET_THREAD(thread); + CRPackBuffer *buf = &thread->BeginEndBuffer; - if ( thread->netServer.conn->Barf && - (thread->BeginEndMode == GL_LINES - || thread->BeginEndMode == GL_TRIANGLES - || thread->BeginEndMode == GL_QUADS - || thread->BeginEndMode == GL_POLYGON ) ) - { - CRASSERT(buf->pack); + if ( thread->netServer.conn->Barf && + (thread->BeginEndMode == GL_LINES + || thread->BeginEndMode == GL_TRIANGLES + || thread->BeginEndMode == GL_QUADS + || thread->BeginEndMode == GL_POLYGON ) ) + { + CRASSERT(buf->pack); - crPackReleaseBuffer( thread->packer ); - crPackSetBuffer( thread->packer, &thread->normBuffer ); - if ( !crPackCanHoldBuffer( buf ) ) - packspuFlush( (void *) thread ); + crPackReleaseBuffer( thread->packer ); + crPackSetBuffer( thread->packer, &thread->normBuffer ); + if ( !crPackCanHoldBuffer( buf ) ) + packspuFlush( (void *) thread ); - crPackAppendBuffer( buf ); - crNetFree( thread->netServer.conn, buf->pack ); - buf->pack = NULL; - } + crPackAppendBuffer( buf ); + crNetFree( thread->netServer.conn, buf->pack ); + buf->pack = NULL; + } - if (pack_spu.swap) - { - crPackEndSWAP(); - } - else - { - crPackEnd(); - } + if (pack_spu.swap) + { + crPackEndSWAP(); + } + else + { + crPackEnd(); + } } static void DoVertex( void ) { - GET_THREAD(thread); - CRPackBuffer *buf = &thread->BeginEndBuffer; - CRPackBuffer *gbuf = &thread->normBuffer; - int num_data; - int num_opcode; + GET_THREAD(thread); + CRPackBuffer *buf = &thread->BeginEndBuffer; + CRPackBuffer *gbuf = &thread->normBuffer; + int num_data; + int num_opcode; - /*crDebug( "really doing Vertex" );*/ - crPackReleaseBuffer( thread->packer ); - num_data = buf->data_current - buf->data_start; - num_opcode = buf->opcode_start - buf->opcode_current; - crPackSetBuffer( thread->packer, gbuf ); - if ( !crPackCanHoldBuffer( buf ) ) - /* doesn't hold, first flush gbuf*/ - packspuFlush( (void *) thread ); + /*crDebug( "really doing Vertex" );*/ + crPackReleaseBuffer( thread->packer ); + num_data = buf->data_current - buf->data_start; + num_opcode = buf->opcode_start - buf->opcode_current; + crPackSetBuffer( thread->packer, gbuf ); + if ( !crPackCanHoldBuffer( buf ) ) + /* doesn't hold, first flush gbuf*/ + packspuFlush( (void *) thread ); - crPackAppendBuffer( buf ); - crPackReleaseBuffer( thread->packer ); - crPackSetBuffer( thread->packer, buf ); - crPackResetPointers(thread->packer); + crPackAppendBuffer( buf ); + crPackReleaseBuffer( thread->packer ); + crPackSetBuffer( thread->packer, buf ); + crPackResetPointers(thread->packer); } static void RunState( void ) { - GET_THREAD(thread); - if (! thread->netServer.conn->Barf ) return; - if (thread->BeginEndState == -1) return; - switch(thread->BeginEndMode) { - case GL_POLYGON: - return; - case GL_LINES: - thread->BeginEndState = (thread->BeginEndState + 1) % 2; - if (thread->BeginEndState) - return; - break; - case GL_TRIANGLES: - thread->BeginEndState = (thread->BeginEndState + 1) % 3; - if (thread->BeginEndState) - return; - break; - case GL_QUADS: - thread->BeginEndState = (thread->BeginEndState + 1) % 4; - if (thread->BeginEndState) - return; - break; - } - DoVertex(); + GET_THREAD(thread); + if (! thread->netServer.conn->Barf ) return; + if (thread->BeginEndState == -1) return; + switch(thread->BeginEndMode) { + case GL_POLYGON: + return; + case GL_LINES: + thread->BeginEndState = (thread->BeginEndState + 1) % 2; + if (thread->BeginEndState) + return; + break; + case GL_TRIANGLES: + thread->BeginEndState = (thread->BeginEndState + 1) % 3; + if (thread->BeginEndState) + return; + break; + case GL_QUADS: + thread->BeginEndState = (thread->BeginEndState + 1) % 4; + if (thread->BeginEndState) + return; + break; + } + DoVertex(); } """ @@ -140,15 +140,15 @@ for func_name in apiutil.AllSpecials( "packspu_vertex" ): - params = apiutil.Parameters(func_name) - print 'void PACKSPU_APIENTRY packspu_%s( %s )' % ( func_name, apiutil.MakeDeclarationString(params) ) - print '{' - print '\tif (pack_spu.swap)' - print '\t{' - print '\t\tcrPack%sSWAP( %s );' % ( func_name, apiutil.MakeCallString( params ) ) - print '\t}' - print '\telse' - print '\t{' - print '\t\tcrPack%s( %s );' % ( func_name, apiutil.MakeCallString( params ) ) - print '\t}' - print '\tRunState();' - print '}' + params = apiutil.Parameters(func_name) + print 'void PACKSPU_APIENTRY packspu_%s( %s )' % ( func_name, apiutil.MakeDeclarationString(params) ) + print '{' + print '\tif (pack_spu.swap)' + print '\t{' + print '\t\tcrPack%sSWAP( %s );' % ( func_name, apiutil.MakeCallString( params ) ) + print '\t}' + print '\telse' + print '\t{' + print '\t\tcrPack%s( %s );' % ( func_name, apiutil.MakeCallString( params ) ) + print '\t}' + print '\tRunState();' + print '}' Index: /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_bufferobject.c =================================================================== --- /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_bufferobject.c (revision 20082) +++ /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_bufferobject.c (revision 20083) @@ -15,43 +15,43 @@ packspu_MapBufferARB( GLenum target, GLenum access ) { - GLint size = -1; - GET_CONTEXT(ctx); - void *buffer; - CRBufferObject *bufObj; + GLint size = -1; + GET_CONTEXT(ctx); + void *buffer; + CRBufferObject *bufObj; - (void) crStateMapBufferARB( target, access ); + (void) crStateMapBufferARB( target, access ); - crStateGetBufferParameterivARB(target, GL_BUFFER_SIZE_ARB, &size); - if (size <= 0) - return NULL; + crStateGetBufferParameterivARB(target, GL_BUFFER_SIZE_ARB, &size); + if (size <= 0) + return NULL; - if (crStateGetError()) { - /* something may have gone wrong already */ - return NULL; - } + if (crStateGetError()) { + /* something may have gone wrong already */ + return NULL; + } - /* allocate buffer space */ - buffer = crAlloc(size); - if (!buffer) { - return NULL; - } + /* allocate buffer space */ + buffer = crAlloc(size); + if (!buffer) { + return NULL; + } - /* update state tracker info */ - if (target == GL_ARRAY_BUFFER_ARB) { - bufObj = ctx->clientState->bufferobject.arrayBuffer; - } - else { - CRASSERT(target == GL_ELEMENT_ARRAY_BUFFER_ARB); - bufObj = ctx->clientState->bufferobject.elementsBuffer; - } - bufObj->pointer = buffer; + /* update state tracker info */ + if (target == GL_ARRAY_BUFFER_ARB) { + bufObj = ctx->clientState->bufferobject.arrayBuffer; + } + else { + CRASSERT(target == GL_ELEMENT_ARRAY_BUFFER_ARB); + bufObj = ctx->clientState->bufferobject.elementsBuffer; + } + bufObj->pointer = buffer; - /* Get current buffer data from server. - * Ideally, if we could detect that the entire buffer was being - * rewritten, we wouldn't have to fetch the current data here. - */ - packspu_GetBufferSubDataARB(target, 0, bufObj->size, buffer); + /* Get current buffer data from server. + * Ideally, if we could detect that the entire buffer was being + * rewritten, we wouldn't have to fetch the current data here. + */ + packspu_GetBufferSubDataARB(target, 0, bufObj->size, buffer); - return buffer; + return buffer; } @@ -60,24 +60,24 @@ packspu_UnmapBufferARB( GLenum target ) { - CRBufferObject *bufObj; - GET_CONTEXT(ctx); + CRBufferObject *bufObj; + GET_CONTEXT(ctx); - if (target == GL_ARRAY_BUFFER_ARB) { - bufObj = ctx->clientState->bufferobject.arrayBuffer; - } - else { - CRASSERT(target == GL_ELEMENT_ARRAY_BUFFER_ARB); - bufObj = ctx->clientState->bufferobject.elementsBuffer; - } + if (target == GL_ARRAY_BUFFER_ARB) { + bufObj = ctx->clientState->bufferobject.arrayBuffer; + } + else { + CRASSERT(target == GL_ELEMENT_ARRAY_BUFFER_ARB); + bufObj = ctx->clientState->bufferobject.elementsBuffer; + } - /* send new buffer contents to server */ - crPackBufferDataARB( target, bufObj->size, bufObj->pointer, bufObj->usage ); + /* send new buffer contents to server */ + crPackBufferDataARB( target, bufObj->size, bufObj->pointer, bufObj->usage ); - /* free the buffer / unmap it */ - crFree(bufObj->pointer); + /* free the buffer / unmap it */ + crFree(bufObj->pointer); - crStateUnmapBufferARB( target ); + crStateUnmapBufferARB( target ); - return GL_TRUE; + return GL_TRUE; } @@ -85,8 +85,8 @@ void PACKSPU_APIENTRY packspu_BufferDataARB( GLenum target, GLsizeiptrARB size, - const GLvoid * data, GLenum usage ) + const GLvoid * data, GLenum usage ) { - crStateBufferDataARB(target, size, data, usage); - crPackBufferDataARB(target, size, data, usage); + crStateBufferDataARB(target, size, data, usage); + crPackBufferDataARB(target, size, data, usage); } @@ -95,5 +95,5 @@ packspu_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params) { - crStateGetBufferPointervARB( target, pname, params ); + crStateGetBufferPointervARB( target, pname, params ); } @@ -102,5 +102,5 @@ packspu_GetBufferParameterivARB( GLenum target, GLenum pname, GLint * params ) { - crStateGetBufferParameterivARB( target, pname, params ); + crStateGetBufferParameterivARB( target, pname, params ); } @@ -112,5 +112,5 @@ packspu_BindBufferARB( GLenum target, GLuint buffer ) { - crStateBindBufferARB(target, buffer); - crPackBindBufferARB(target, buffer); + crStateBindBufferARB(target, buffer); + crPackBindBufferARB(target, buffer); } Index: /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_client.c =================================================================== --- /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_client.c (revision 20082) +++ /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_client.c (revision 20083) @@ -13,13 +13,13 @@ { #if CR_ARB_vertex_buffer_object - GET_CONTEXT(ctx); - if (ctx->clientState->extensions.ARB_vertex_buffer_object) { - if (pack_spu.swap) - crPackFogCoordPointerEXTSWAP( type, stride, pointer ); - else - crPackFogCoordPointerEXT( type, stride, pointer ); - } -#endif - crStateFogCoordPointerEXT( type, stride, pointer ); + GET_CONTEXT(ctx); + if (ctx->clientState->extensions.ARB_vertex_buffer_object) { + if (pack_spu.swap) + crPackFogCoordPointerEXTSWAP( type, stride, pointer ); + else + crPackFogCoordPointerEXT( type, stride, pointer ); + } +#endif + crStateFogCoordPointerEXT( type, stride, pointer ); } @@ -27,13 +27,13 @@ { #if CR_ARB_vertex_buffer_object - GET_CONTEXT(ctx); - if (ctx->clientState->extensions.ARB_vertex_buffer_object) { - if (pack_spu.swap) - crPackColorPointerSWAP( size, type, stride, pointer ); - else - crPackColorPointer( size, type, stride, pointer ); - } -#endif - crStateColorPointer( size, type, stride, pointer ); + GET_CONTEXT(ctx); + if (ctx->clientState->extensions.ARB_vertex_buffer_object) { + if (pack_spu.swap) + crPackColorPointerSWAP( size, type, stride, pointer ); + else + crPackColorPointer( size, type, stride, pointer ); + } +#endif + crStateColorPointer( size, type, stride, pointer ); } @@ -41,13 +41,13 @@ { #if CR_ARB_vertex_buffer_object - GET_CONTEXT(ctx); - if (ctx->clientState->extensions.ARB_vertex_buffer_object) { - if (pack_spu.swap) - crPackSecondaryColorPointerEXTSWAP( size, type, stride, pointer ); - else - crPackSecondaryColorPointerEXT( size, type, stride, pointer ); - } -#endif - crStateSecondaryColorPointerEXT( size, type, stride, pointer ); + GET_CONTEXT(ctx); + if (ctx->clientState->extensions.ARB_vertex_buffer_object) { + if (pack_spu.swap) + crPackSecondaryColorPointerEXTSWAP( size, type, stride, pointer ); + else + crPackSecondaryColorPointerEXT( size, type, stride, pointer ); + } +#endif + crStateSecondaryColorPointerEXT( size, type, stride, pointer ); } @@ -55,14 +55,14 @@ { #if CR_ARB_vertex_buffer_object - GET_CONTEXT(ctx); - CRASSERT(ctx->clientState->extensions.ARB_vertex_buffer_object); - if (ctx->clientState->extensions.ARB_vertex_buffer_object) { - if (pack_spu.swap) - crPackVertexPointerSWAP( size, type, stride, pointer ); - else - crPackVertexPointer( size, type, stride, pointer ); - } -#endif - crStateVertexPointer( size, type, stride, pointer ); + GET_CONTEXT(ctx); + CRASSERT(ctx->clientState->extensions.ARB_vertex_buffer_object); + if (ctx->clientState->extensions.ARB_vertex_buffer_object) { + if (pack_spu.swap) + crPackVertexPointerSWAP( size, type, stride, pointer ); + else + crPackVertexPointer( size, type, stride, pointer ); + } +#endif + crStateVertexPointer( size, type, stride, pointer ); } @@ -70,13 +70,13 @@ { #if CR_ARB_vertex_buffer_object - GET_CONTEXT(ctx); - if (ctx->clientState->extensions.ARB_vertex_buffer_object) { - if (pack_spu.swap) - crPackTexCoordPointerSWAP( size, type, stride, pointer ); - else - crPackTexCoordPointer( size, type, stride, pointer ); - } -#endif - crStateTexCoordPointer( size, type, stride, pointer ); + GET_CONTEXT(ctx); + if (ctx->clientState->extensions.ARB_vertex_buffer_object) { + if (pack_spu.swap) + crPackTexCoordPointerSWAP( size, type, stride, pointer ); + else + crPackTexCoordPointer( size, type, stride, pointer ); + } +#endif + crStateTexCoordPointer( size, type, stride, pointer ); } @@ -84,13 +84,13 @@ { #if CR_ARB_vertex_buffer_object - GET_CONTEXT(ctx); - if (ctx->clientState->extensions.ARB_vertex_buffer_object) { - if (pack_spu.swap) - crPackNormalPointerSWAP( type, stride, pointer ); - else - crPackNormalPointer( type, stride, pointer ); - } -#endif - crStateNormalPointer( type, stride, pointer ); + GET_CONTEXT(ctx); + if (ctx->clientState->extensions.ARB_vertex_buffer_object) { + if (pack_spu.swap) + crPackNormalPointerSWAP( type, stride, pointer ); + else + crPackNormalPointer( type, stride, pointer ); + } +#endif + crStateNormalPointer( type, stride, pointer ); } @@ -98,13 +98,13 @@ { #if CR_ARB_vertex_buffer_object - GET_CONTEXT(ctx); - if (ctx->clientState->extensions.ARB_vertex_buffer_object) { - if (pack_spu.swap) - crPackEdgeFlagPointerSWAP( stride, pointer ); - else - crPackEdgeFlagPointer( stride, pointer ); - } -#endif - crStateEdgeFlagPointer( stride, pointer ); + GET_CONTEXT(ctx); + if (ctx->clientState->extensions.ARB_vertex_buffer_object) { + if (pack_spu.swap) + crPackEdgeFlagPointerSWAP( stride, pointer ); + else + crPackEdgeFlagPointer( stride, pointer ); + } +#endif + crStateEdgeFlagPointer( stride, pointer ); } @@ -112,13 +112,13 @@ { #if CR_ARB_vertex_buffer_object - GET_CONTEXT(ctx); - if (ctx->clientState->extensions.ARB_vertex_buffer_object) { - if (pack_spu.swap) - crPackVertexAttribPointerARBSWAP( index, size, type, normalized, stride, pointer ); - else - crPackVertexAttribPointerARB( index, size, type, normalized, stride, pointer ); - } -#endif - crStateVertexAttribPointerARB( index, size, type, normalized, stride, pointer ); + GET_CONTEXT(ctx); + if (ctx->clientState->extensions.ARB_vertex_buffer_object) { + if (pack_spu.swap) + crPackVertexAttribPointerARBSWAP( index, size, type, normalized, stride, pointer ); + else + crPackVertexAttribPointerARB( index, size, type, normalized, stride, pointer ); + } +#endif + crStateVertexAttribPointerARB( index, size, type, normalized, stride, pointer ); } @@ -126,18 +126,18 @@ { #if CR_ARB_vertex_buffer_object - GET_CONTEXT(ctx); - if (ctx->clientState->extensions.ARB_vertex_buffer_object) { - if (pack_spu.swap) - crPackVertexAttribPointerNVSWAP( index, size, type, stride, pointer ); - else - crPackVertexAttribPointerNV( index, size, type, stride, pointer ); - } -#endif - crStateVertexAttribPointerNV( index, size, type, stride, pointer ); + GET_CONTEXT(ctx); + if (ctx->clientState->extensions.ARB_vertex_buffer_object) { + if (pack_spu.swap) + crPackVertexAttribPointerNVSWAP( index, size, type, stride, pointer ); + else + crPackVertexAttribPointerNV( index, size, type, stride, pointer ); + } +#endif + crStateVertexAttribPointerNV( index, size, type, stride, pointer ); } void PACKSPU_APIENTRY packspu_GetPointerv( GLenum pname, GLvoid **params ) { - crStateGetPointerv( pname, params ); + crStateGetPointerv( pname, params ); } @@ -145,13 +145,13 @@ { #if CR_ARB_vertex_buffer_object - GET_CONTEXT(ctx); - if (ctx->clientState->extensions.ARB_vertex_buffer_object) { - if (pack_spu.swap) - crPackInterleavedArraysSWAP( format, stride, pointer ); - else - crPackInterleavedArrays( format, stride, pointer ); - } -#endif - crStateInterleavedArrays( format, stride, pointer ); + GET_CONTEXT(ctx); + if (ctx->clientState->extensions.ARB_vertex_buffer_object) { + if (pack_spu.swap) + crPackInterleavedArraysSWAP( format, stride, pointer ); + else + crPackInterleavedArrays( format, stride, pointer ); + } +#endif + crStateInterleavedArrays( format, stride, pointer ); } @@ -160,28 +160,28 @@ packspu_ArrayElement( GLint index ) { - GLboolean serverArrays = GL_FALSE; - -#if CR_ARB_vertex_buffer_object - GET_CONTEXT(ctx); - if (ctx->clientState->extensions.ARB_vertex_buffer_object) - serverArrays = crStateUseServerArrays(); -#endif - - if (serverArrays) { - /* Send the DrawArrays command over the wire */ - if (pack_spu.swap) - crPackArrayElementSWAP( index ); - else - crPackArrayElement( index ); - } - else { - /* evaluate locally */ - GET_CONTEXT(ctx); - CRClientState *clientState = &(ctx->clientState->client); - if (pack_spu.swap) - crPackExpandArrayElementSWAP( index, clientState ); - else - crPackExpandArrayElement( index, clientState ); - } + GLboolean serverArrays = GL_FALSE; + +#if CR_ARB_vertex_buffer_object + GET_CONTEXT(ctx); + if (ctx->clientState->extensions.ARB_vertex_buffer_object) + serverArrays = crStateUseServerArrays(); +#endif + + if (serverArrays) { + /* Send the DrawArrays command over the wire */ + if (pack_spu.swap) + crPackArrayElementSWAP( index ); + else + crPackArrayElement( index ); + } + else { + /* evaluate locally */ + GET_CONTEXT(ctx); + CRClientState *clientState = &(ctx->clientState->client); + if (pack_spu.swap) + crPackExpandArrayElementSWAP( index, clientState ); + else + crPackExpandArrayElement( index, clientState ); + } } @@ -190,28 +190,28 @@ packspu_DrawElements( GLenum mode, GLsizei count, GLenum type, const GLvoid *indices ) { - GLboolean serverArrays = GL_FALSE; - -#if CR_ARB_vertex_buffer_object - GET_CONTEXT(ctx); - if (ctx->clientState->extensions.ARB_vertex_buffer_object) - serverArrays = crStateUseServerArrays(); -#endif - - if (serverArrays) { - /* Send the DrawArrays command over the wire */ - if (pack_spu.swap) - crPackDrawElementsSWAP( mode, count, type, indices ); - else - crPackDrawElements( mode, count, type, indices ); - } - else { - /* evaluate locally */ - GET_CONTEXT(ctx); - CRClientState *clientState = &(ctx->clientState->client); - if (pack_spu.swap) - crPackExpandDrawElementsSWAP( mode, count, type, indices, clientState ); - else - crPackExpandDrawElements( mode, count, type, indices, clientState ); - } + GLboolean serverArrays = GL_FALSE; + +#if CR_ARB_vertex_buffer_object + GET_CONTEXT(ctx); + if (ctx->clientState->extensions.ARB_vertex_buffer_object) + serverArrays = crStateUseServerArrays(); +#endif + + if (serverArrays) { + /* Send the DrawArrays command over the wire */ + if (pack_spu.swap) + crPackDrawElementsSWAP( mode, count, type, indices ); + else + crPackDrawElements( mode, count, type, indices ); + } + else { + /* evaluate locally */ + GET_CONTEXT(ctx); + CRClientState *clientState = &(ctx->clientState->client); + if (pack_spu.swap) + crPackExpandDrawElementsSWAP( mode, count, type, indices, clientState ); + else + crPackExpandDrawElements( mode, count, type, indices, clientState ); + } } @@ -220,28 +220,28 @@ packspu_DrawRangeElements( GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices ) { - GLboolean serverArrays = GL_FALSE; - -#if CR_ARB_vertex_buffer_object - GET_CONTEXT(ctx); - if (ctx->clientState->extensions.ARB_vertex_buffer_object) - serverArrays = crStateUseServerArrays(); -#endif - - if (serverArrays) { - /* Send the DrawRangeElements command over the wire */ - if (pack_spu.swap) - crPackDrawRangeElementsSWAP( mode, start, end, count, type, indices ); - else - crPackDrawRangeElements( mode, start, end, count, type, indices ); - } - else { - /* evaluate locally */ - GET_CONTEXT(ctx); - CRClientState *clientState = &(ctx->clientState->client); - if (pack_spu.swap) - crPackExpandDrawRangeElementsSWAP( mode, start, end, count, type, indices, clientState ); - else - crPackExpandDrawRangeElements( mode, start, end, count, type, indices, clientState ); - } + GLboolean serverArrays = GL_FALSE; + +#if CR_ARB_vertex_buffer_object + GET_CONTEXT(ctx); + if (ctx->clientState->extensions.ARB_vertex_buffer_object) + serverArrays = crStateUseServerArrays(); +#endif + + if (serverArrays) { + /* Send the DrawRangeElements command over the wire */ + if (pack_spu.swap) + crPackDrawRangeElementsSWAP( mode, start, end, count, type, indices ); + else + crPackDrawRangeElements( mode, start, end, count, type, indices ); + } + else { + /* evaluate locally */ + GET_CONTEXT(ctx); + CRClientState *clientState = &(ctx->clientState->client); + if (pack_spu.swap) + crPackExpandDrawRangeElementsSWAP( mode, start, end, count, type, indices, clientState ); + else + crPackExpandDrawRangeElements( mode, start, end, count, type, indices, clientState ); + } } @@ -250,28 +250,28 @@ packspu_DrawArrays( GLenum mode, GLint first, GLsizei count ) { - GLboolean serverArrays = GL_FALSE; - -#if CR_ARB_vertex_buffer_object - GET_CONTEXT(ctx); - if (ctx->clientState->extensions.ARB_vertex_buffer_object) - serverArrays = crStateUseServerArrays(); -#endif - - if (serverArrays) { - /* Send the DrawArrays command over the wire */ - if (pack_spu.swap) - crPackDrawArraysSWAP( mode, first, count ); - else - crPackDrawArrays( mode, first, count ); - } - else { - /* evaluate locally */ - GET_CONTEXT(ctx); - CRClientState *clientState = &(ctx->clientState->client); - if (pack_spu.swap) - crPackExpandDrawArraysSWAP( mode, first, count, clientState ); - else - crPackExpandDrawArrays( mode, first, count, clientState ); - } + GLboolean serverArrays = GL_FALSE; + +#if CR_ARB_vertex_buffer_object + GET_CONTEXT(ctx); + if (ctx->clientState->extensions.ARB_vertex_buffer_object) + serverArrays = crStateUseServerArrays(); +#endif + + if (serverArrays) { + /* Send the DrawArrays command over the wire */ + if (pack_spu.swap) + crPackDrawArraysSWAP( mode, first, count ); + else + crPackDrawArrays( mode, first, count ); + } + else { + /* evaluate locally */ + GET_CONTEXT(ctx); + CRClientState *clientState = &(ctx->clientState->client); + if (pack_spu.swap) + crPackExpandDrawArraysSWAP( mode, first, count, clientState ); + else + crPackExpandDrawArrays( mode, first, count, clientState ); + } } @@ -280,20 +280,20 @@ void PACKSPU_APIENTRY packspu_MultiDrawArraysEXT( GLenum mode, GLint *first, GLsizei *count, GLsizei primcount ) { - GLint i; - for (i = 0; i < primcount; i++) { - if (count[i] > 0) { - packspu_DrawArrays(mode, first[i], count[i]); - } - } + GLint i; + for (i = 0; i < primcount; i++) { + if (count[i] > 0) { + packspu_DrawArrays(mode, first[i], count[i]); + } + } } void PACKSPU_APIENTRY packspu_MultiDrawElementsEXT( GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount ) { - GLint i; - for (i = 0; i < primcount; i++) { - if (count[i] > 0) { - packspu_DrawElements(mode, count[i], type, indices[i]); - } - } + GLint i; + for (i = 0; i < primcount; i++) { + if (count[i] > 0) { + packspu_DrawElements(mode, count[i], type, indices[i]); + } + } } #endif @@ -302,16 +302,16 @@ void PACKSPU_APIENTRY packspu_EnableClientState( GLenum array ) { - crStateEnableClientState( array ); + crStateEnableClientState( array ); } void PACKSPU_APIENTRY packspu_DisableClientState( GLenum array ) { - crStateDisableClientState( array ); + crStateDisableClientState( array ); } void PACKSPU_APIENTRY packspu_ClientActiveTextureARB( GLenum texUnit ) { - crStateClientActiveTextureARB( texUnit ); - /* XXX also send to server for texcoord arrays? */ + crStateClientActiveTextureARB( texUnit ); + /* XXX also send to server for texcoord arrays? */ } @@ -319,41 +319,41 @@ void PACKSPU_APIENTRY packspu_Enable( GLenum cap ) { - switch (cap) { - case GL_VERTEX_ARRAY: - case GL_NORMAL_ARRAY: - case GL_COLOR_ARRAY: - case GL_INDEX_ARRAY: - case GL_TEXTURE_COORD_ARRAY: - case GL_EDGE_FLAG_ARRAY: - case GL_FOG_COORDINATE_ARRAY_EXT: - case GL_SECONDARY_COLOR_ARRAY_EXT: + switch (cap) { + case GL_VERTEX_ARRAY: + case GL_NORMAL_ARRAY: + case GL_COLOR_ARRAY: + case GL_INDEX_ARRAY: + case GL_TEXTURE_COORD_ARRAY: + case GL_EDGE_FLAG_ARRAY: + case GL_FOG_COORDINATE_ARRAY_EXT: + case GL_SECONDARY_COLOR_ARRAY_EXT: #if CR_NV_vertex_program - case GL_VERTEX_ATTRIB_ARRAY0_NV: - case GL_VERTEX_ATTRIB_ARRAY1_NV: - case GL_VERTEX_ATTRIB_ARRAY2_NV: - case GL_VERTEX_ATTRIB_ARRAY3_NV: - case GL_VERTEX_ATTRIB_ARRAY4_NV: - case GL_VERTEX_ATTRIB_ARRAY5_NV: - case GL_VERTEX_ATTRIB_ARRAY6_NV: - case GL_VERTEX_ATTRIB_ARRAY7_NV: - case GL_VERTEX_ATTRIB_ARRAY8_NV: - case GL_VERTEX_ATTRIB_ARRAY9_NV: - case GL_VERTEX_ATTRIB_ARRAY10_NV: - case GL_VERTEX_ATTRIB_ARRAY11_NV: - case GL_VERTEX_ATTRIB_ARRAY12_NV: - case GL_VERTEX_ATTRIB_ARRAY13_NV: - case GL_VERTEX_ATTRIB_ARRAY14_NV: - case GL_VERTEX_ATTRIB_ARRAY15_NV: + case GL_VERTEX_ATTRIB_ARRAY0_NV: + case GL_VERTEX_ATTRIB_ARRAY1_NV: + case GL_VERTEX_ATTRIB_ARRAY2_NV: + case GL_VERTEX_ATTRIB_ARRAY3_NV: + case GL_VERTEX_ATTRIB_ARRAY4_NV: + case GL_VERTEX_ATTRIB_ARRAY5_NV: + case GL_VERTEX_ATTRIB_ARRAY6_NV: + case GL_VERTEX_ATTRIB_ARRAY7_NV: + case GL_VERTEX_ATTRIB_ARRAY8_NV: + case GL_VERTEX_ATTRIB_ARRAY9_NV: + case GL_VERTEX_ATTRIB_ARRAY10_NV: + case GL_VERTEX_ATTRIB_ARRAY11_NV: + case GL_VERTEX_ATTRIB_ARRAY12_NV: + case GL_VERTEX_ATTRIB_ARRAY13_NV: + case GL_VERTEX_ATTRIB_ARRAY14_NV: + case GL_VERTEX_ATTRIB_ARRAY15_NV: #endif /* CR_NV_vertex_program */ - crStateEnableClientState(cap); - break; - default: - ; - } - - if (pack_spu.swap) - crPackEnableSWAP(cap); - else - crPackEnable(cap); + crStateEnableClientState(cap); + break; + default: + ; + } + + if (pack_spu.swap) + crPackEnableSWAP(cap); + else + crPackEnable(cap); } @@ -361,41 +361,41 @@ void PACKSPU_APIENTRY packspu_Disable( GLenum cap ) { - switch (cap) { - case GL_VERTEX_ARRAY: - case GL_NORMAL_ARRAY: - case GL_COLOR_ARRAY: - case GL_INDEX_ARRAY: - case GL_TEXTURE_COORD_ARRAY: - case GL_EDGE_FLAG_ARRAY: - case GL_FOG_COORDINATE_ARRAY_EXT: - case GL_SECONDARY_COLOR_ARRAY_EXT: + switch (cap) { + case GL_VERTEX_ARRAY: + case GL_NORMAL_ARRAY: + case GL_COLOR_ARRAY: + case GL_INDEX_ARRAY: + case GL_TEXTURE_COORD_ARRAY: + case GL_EDGE_FLAG_ARRAY: + case GL_FOG_COORDINATE_ARRAY_EXT: + case GL_SECONDARY_COLOR_ARRAY_EXT: #if CR_NV_vertex_program - case GL_VERTEX_ATTRIB_ARRAY0_NV: - case GL_VERTEX_ATTRIB_ARRAY1_NV: - case GL_VERTEX_ATTRIB_ARRAY2_NV: - case GL_VERTEX_ATTRIB_ARRAY3_NV: - case GL_VERTEX_ATTRIB_ARRAY4_NV: - case GL_VERTEX_ATTRIB_ARRAY5_NV: - case GL_VERTEX_ATTRIB_ARRAY6_NV: - case GL_VERTEX_ATTRIB_ARRAY7_NV: - case GL_VERTEX_ATTRIB_ARRAY8_NV: - case GL_VERTEX_ATTRIB_ARRAY9_NV: - case GL_VERTEX_ATTRIB_ARRAY10_NV: - case GL_VERTEX_ATTRIB_ARRAY11_NV: - case GL_VERTEX_ATTRIB_ARRAY12_NV: - case GL_VERTEX_ATTRIB_ARRAY13_NV: - case GL_VERTEX_ATTRIB_ARRAY14_NV: - case GL_VERTEX_ATTRIB_ARRAY15_NV: + case GL_VERTEX_ATTRIB_ARRAY0_NV: + case GL_VERTEX_ATTRIB_ARRAY1_NV: + case GL_VERTEX_ATTRIB_ARRAY2_NV: + case GL_VERTEX_ATTRIB_ARRAY3_NV: + case GL_VERTEX_ATTRIB_ARRAY4_NV: + case GL_VERTEX_ATTRIB_ARRAY5_NV: + case GL_VERTEX_ATTRIB_ARRAY6_NV: + case GL_VERTEX_ATTRIB_ARRAY7_NV: + case GL_VERTEX_ATTRIB_ARRAY8_NV: + case GL_VERTEX_ATTRIB_ARRAY9_NV: + case GL_VERTEX_ATTRIB_ARRAY10_NV: + case GL_VERTEX_ATTRIB_ARRAY11_NV: + case GL_VERTEX_ATTRIB_ARRAY12_NV: + case GL_VERTEX_ATTRIB_ARRAY13_NV: + case GL_VERTEX_ATTRIB_ARRAY14_NV: + case GL_VERTEX_ATTRIB_ARRAY15_NV: #endif /* CR_NV_vertex_program */ - crStateDisableClientState(cap); - break; - default: - ; - } - - if (pack_spu.swap) - crPackDisableSWAP(cap); - else - crPackDisable(cap); + crStateDisableClientState(cap); + break; + default: + ; + } + + if (pack_spu.swap) + crPackDisableSWAP(cap); + else + crPackDisable(cap); } @@ -403,9 +403,9 @@ void PACKSPU_APIENTRY packspu_PushClientAttrib( GLbitfield mask ) { - crStatePushClientAttrib(mask); + crStatePushClientAttrib(mask); } void PACKSPU_APIENTRY packspu_PopClientAttrib( void ) { - crStatePopClientAttrib(); -} + crStatePopClientAttrib(); +} Index: /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_flush.py =================================================================== --- /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_flush.py (revision 20082) +++ /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_flush.py (revision 20083) @@ -26,16 +26,16 @@ for func_name in apiutil.AllSpecials( "packspu_flush" ): - params = apiutil.Parameters(func_name) - print 'void PACKSPU_APIENTRY packspu_%s( %s )' % ( func_name, apiutil.MakeDeclarationString(params)) - print '{' - print '\tGET_THREAD(thread);' - print '\tif (pack_spu.swap)' - print '\t{' - print '\t\tcrPack%sSWAP( %s );' % ( func_name, apiutil.MakeCallString( params ) ) - print '\t}' - print '\telse' - print '\t{' - print '\t\tcrPack%s( %s );' % ( func_name, apiutil.MakeCallString( params ) ) - print '\t}' - print '\tpackspuFlush( (void *) thread );' - print '}\n' + params = apiutil.Parameters(func_name) + print 'void PACKSPU_APIENTRY packspu_%s( %s )' % ( func_name, apiutil.MakeDeclarationString(params)) + print '{' + print '\tGET_THREAD(thread);' + print '\tif (pack_spu.swap)' + print '\t{' + print '\t\tcrPack%sSWAP( %s );' % ( func_name, apiutil.MakeCallString( params ) ) + print '\t}' + print '\telse' + print '\t{' + print '\t\tcrPack%s( %s );' % ( func_name, apiutil.MakeCallString( params ) ) + print '\t}' + print '\tpackspuFlush( (void *) thread );' + print '}\n' Index: /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_get.py =================================================================== --- /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_get.py (revision 20082) +++ /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_get.py (revision 20083) @@ -23,124 +23,124 @@ easy_swaps = { - 'GenTextures': '(unsigned int) n', - 'GetClipPlane': '4', - 'GetPolygonStipple': '0' + 'GenTextures': '(unsigned int) n', + 'GetClipPlane': '4', + 'GetPolygonStipple': '0' } - + simple_funcs = [ 'GetIntegerv', 'GetFloatv', 'GetDoublev', 'GetBooleanv' ] simple_swaps = [ 'SWAP32', 'SWAPFLOAT', 'SWAPDOUBLE', '(GLboolean) SWAP32' ] hard_funcs = { - 'GetLightfv': 'SWAPFLOAT', - 'GetLightiv': 'SWAP32', - 'GetMaterialfv': 'SWAPFLOAT', - 'GetMaterialiv': 'SWAP32', - 'GetTexEnvfv': 'SWAPFLOAT', - 'GetTexEnviv': 'SWAP32', - 'GetTexGendv': 'SWAPDOUBLE', - 'GetTexGenfv': 'SWAPFLOAT', - 'GetTexGeniv': 'SWAP32', - 'GetTexLevelParameterfv': 'SWAPFLOAT', - 'GetTexLevelParameteriv': 'SWAP32', - 'GetTexParameterfv': 'SWAPFLOAT', - 'GetTexParameteriv': 'SWAP32' } + 'GetLightfv': 'SWAPFLOAT', + 'GetLightiv': 'SWAP32', + 'GetMaterialfv': 'SWAPFLOAT', + 'GetMaterialiv': 'SWAP32', + 'GetTexEnvfv': 'SWAPFLOAT', + 'GetTexEnviv': 'SWAP32', + 'GetTexGendv': 'SWAPDOUBLE', + 'GetTexGenfv': 'SWAPFLOAT', + 'GetTexGeniv': 'SWAP32', + 'GetTexLevelParameterfv': 'SWAPFLOAT', + 'GetTexLevelParameteriv': 'SWAP32', + 'GetTexParameterfv': 'SWAPFLOAT', + 'GetTexParameteriv': 'SWAP32' } keys = apiutil.GetDispatchedFunctions(sys.argv[1]+"/APIspec.txt") for func_name in keys: - params = apiutil.Parameters(func_name) - return_type = apiutil.ReturnType(func_name) - if apiutil.FindSpecial( "packspu", func_name ): - continue + params = apiutil.Parameters(func_name) + return_type = apiutil.ReturnType(func_name) + if apiutil.FindSpecial( "packspu", func_name ): + continue - if "get" in apiutil.Properties(func_name): - print '%s PACKSPU_APIENTRY packspu_%s( %s )' % ( return_type, func_name, apiutil.MakeDeclarationString( params ) ) - print '{' - print '\tGET_THREAD(thread);' - print '\tint writeback = 1;' - if return_type != 'void': - print '\t%s return_val = (%s) 0;' % (return_type, return_type) - params.append( ("&return_val", "foo", 0) ) - if (func_name in easy_swaps.keys() and easy_swaps[func_name] != '0') or func_name in simple_funcs or func_name in hard_funcs.keys(): - print '\tunsigned int i;' - print '\tif (!(pack_spu.thread[0].netServer.conn->actual_network))' - print '\t{' - print '\t\tcrError( "packspu_%s doesn\'t work when there\'s no actual network involved!\\nTry using the simplequery SPU in your chain!" );' % func_name - print '\t}' - if func_name in simple_funcs: - print '\tif (pname == GL_UNPACK_ALIGNMENT ||' - print '\t\tpname == GL_UNPACK_ROW_LENGTH ||' - print '\t\tpname == GL_UNPACK_SKIP_PIXELS ||' - print '\t\tpname == GL_UNPACK_LSB_FIRST ||' - print '\t\tpname == GL_UNPACK_SWAP_BYTES ||' - print '#ifdef CR_OPENGL_VERSION_1_2' - print '\t\tpname == GL_UNPACK_IMAGE_HEIGHT ||' - print '#endif' - print '\t\tpname == GL_UNPACK_SKIP_ROWS ||' - print '\t\tpname == GL_PACK_ALIGNMENT ||' - print '\t\tpname == GL_PACK_ROW_LENGTH ||' - print '\t\tpname == GL_PACK_SKIP_PIXELS ||' - print '\t\tpname == GL_PACK_LSB_FIRST ||' - print '\t\tpname == GL_PACK_SWAP_BYTES ||' - print '#ifdef CR_OPENGL_VERSION_1_2' - print '\t\tpname == GL_PACK_IMAGE_HEIGHT ||' - print '#endif' - print '\t\tpname == GL_PACK_SKIP_ROWS) {' - print '\t\t\tcrState%s( pname, params );' % func_name - print '\t\t\treturn;' - print '\t}' - params.append( ("&writeback", "foo", 0) ) - print '\tif (pack_spu.swap)' - print '\t{' - print '\t\tcrPack%sSWAP( %s );' % (func_name, apiutil.MakeCallString( params ) ) - print '\t}' - print '\telse' - print '\t{' - print '\t\tcrPack%s( %s );' % (func_name, apiutil.MakeCallString( params ) ) - print '\t}' - print '\tpackspuFlush( (void *) thread );' - print '\twhile (writeback)' - print '\t\tcrNetRecv();' - lastParamName = params[-2][0] - if return_type != 'void': - print '\tif (pack_spu.swap)' - print '\t{' - print '\t\treturn_val = (%s) SWAP32(return_val);' % return_type - print '\t}' - print '\treturn return_val;' - if func_name in easy_swaps.keys() and easy_swaps[func_name] != '0': - limit = easy_swaps[func_name] - print '\tif (pack_spu.swap)' - print '\t{' - print '\t\tfor (i = 0 ; i < %s ; i++)' % limit - print '\t\t{' - if params[-2][1].find( "double" ) > -1: - print '\t\t\t%s[i] = SWAPDOUBLE(%s[i]);' % (lastParamName, lastParamName) - else: - print '\t\t\t%s[i] = SWAP32(%s[i]);' % (lastParamName, lastParamName) - print '\t\t}' - print '\t}' - for index in range(len(simple_funcs)): - if simple_funcs[index] == func_name: - print '\tif (pack_spu.swap)' - print '\t{' - print '\t\tfor (i = 0 ; i < __numValues( pname ) ; i++)' - print '\t\t{' - if simple_swaps[index] == 'SWAPDOUBLE': - print '\t\t\t%s[i] = %s(%s[i]);' % (lastParamName, simple_swaps[index], lastParamName) - else: - print '\t\t\t((GLuint *) %s)[i] = %s(%s[i]);' % (lastParamName, simple_swaps[index], lastParamName) - print '\t\t}' - print '\t}' - if func_name in hard_funcs.keys(): - print '\tif (pack_spu.swap)' - print '\t{' - print '\t\tfor (i = 0 ; i < lookupComponents(pname) ; i++)' - print '\t\t{' - if hard_funcs[func_name] == 'SWAPDOUBLE': - print '\t\t\t%s[i] = %s(%s[i]);' % (lastParamName, hard_funcs[func_name], lastParamName) - else: - print '\t\t\t((GLuint *) %s)[i] = %s(%s[i]);' % (lastParamName, hard_funcs[func_name], lastParamName) - print '\t\t}' - print '\t}' - print '}\n' + if "get" in apiutil.Properties(func_name): + print '%s PACKSPU_APIENTRY packspu_%s( %s )' % ( return_type, func_name, apiutil.MakeDeclarationString( params ) ) + print '{' + print '\tGET_THREAD(thread);' + print '\tint writeback = 1;' + if return_type != 'void': + print '\t%s return_val = (%s) 0;' % (return_type, return_type) + params.append( ("&return_val", "foo", 0) ) + if (func_name in easy_swaps.keys() and easy_swaps[func_name] != '0') or func_name in simple_funcs or func_name in hard_funcs.keys(): + print '\tunsigned int i;' + print '\tif (!(pack_spu.thread[0].netServer.conn->actual_network))' + print '\t{' + print '\t\tcrError( "packspu_%s doesn\'t work when there\'s no actual network involved!\\nTry using the simplequery SPU in your chain!" );' % func_name + print '\t}' + if func_name in simple_funcs: + print '\tif (pname == GL_UNPACK_ALIGNMENT ||' + print '\t\tpname == GL_UNPACK_ROW_LENGTH ||' + print '\t\tpname == GL_UNPACK_SKIP_PIXELS ||' + print '\t\tpname == GL_UNPACK_LSB_FIRST ||' + print '\t\tpname == GL_UNPACK_SWAP_BYTES ||' + print '#ifdef CR_OPENGL_VERSION_1_2' + print '\t\tpname == GL_UNPACK_IMAGE_HEIGHT ||' + print '#endif' + print '\t\tpname == GL_UNPACK_SKIP_ROWS ||' + print '\t\tpname == GL_PACK_ALIGNMENT ||' + print '\t\tpname == GL_PACK_ROW_LENGTH ||' + print '\t\tpname == GL_PACK_SKIP_PIXELS ||' + print '\t\tpname == GL_PACK_LSB_FIRST ||' + print '\t\tpname == GL_PACK_SWAP_BYTES ||' + print '#ifdef CR_OPENGL_VERSION_1_2' + print '\t\tpname == GL_PACK_IMAGE_HEIGHT ||' + print '#endif' + print '\t\tpname == GL_PACK_SKIP_ROWS) {' + print '\t\t\tcrState%s( pname, params );' % func_name + print '\t\t\treturn;' + print '\t}' + params.append( ("&writeback", "foo", 0) ) + print '\tif (pack_spu.swap)' + print '\t{' + print '\t\tcrPack%sSWAP( %s );' % (func_name, apiutil.MakeCallString( params ) ) + print '\t}' + print '\telse' + print '\t{' + print '\t\tcrPack%s( %s );' % (func_name, apiutil.MakeCallString( params ) ) + print '\t}' + print '\tpackspuFlush( (void *) thread );' + print '\twhile (writeback)' + print '\t\tcrNetRecv();' + lastParamName = params[-2][0] + if return_type != 'void': + print '\tif (pack_spu.swap)' + print '\t{' + print '\t\treturn_val = (%s) SWAP32(return_val);' % return_type + print '\t}' + print '\treturn return_val;' + if func_name in easy_swaps.keys() and easy_swaps[func_name] != '0': + limit = easy_swaps[func_name] + print '\tif (pack_spu.swap)' + print '\t{' + print '\t\tfor (i = 0 ; i < %s ; i++)' % limit + print '\t\t{' + if params[-2][1].find( "double" ) > -1: + print '\t\t\t%s[i] = SWAPDOUBLE(%s[i]);' % (lastParamName, lastParamName) + else: + print '\t\t\t%s[i] = SWAP32(%s[i]);' % (lastParamName, lastParamName) + print '\t\t}' + print '\t}' + for index in range(len(simple_funcs)): + if simple_funcs[index] == func_name: + print '\tif (pack_spu.swap)' + print '\t{' + print '\t\tfor (i = 0 ; i < __numValues( pname ) ; i++)' + print '\t\t{' + if simple_swaps[index] == 'SWAPDOUBLE': + print '\t\t\t%s[i] = %s(%s[i]);' % (lastParamName, simple_swaps[index], lastParamName) + else: + print '\t\t\t((GLuint *) %s)[i] = %s(%s[i]);' % (lastParamName, simple_swaps[index], lastParamName) + print '\t\t}' + print '\t}' + if func_name in hard_funcs.keys(): + print '\tif (pack_spu.swap)' + print '\t{' + print '\t\tfor (i = 0 ; i < lookupComponents(pname) ; i++)' + print '\t\t{' + if hard_funcs[func_name] == 'SWAPDOUBLE': + print '\t\t\t%s[i] = %s(%s[i]);' % (lastParamName, hard_funcs[func_name], lastParamName) + else: + print '\t\t\t((GLuint *) %s)[i] = %s(%s[i]);' % (lastParamName, hard_funcs[func_name], lastParamName) + print '\t\t}' + print '\t}' + print '}\n' Index: /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_getstring.c =================================================================== --- /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_getstring.c (revision 20082) +++ /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_getstring.c (revision 20083) @@ -14,32 +14,32 @@ GetExtensions(void) { - GLubyte return_value[10*1000]; - const GLubyte *extensions, *ext; - GET_THREAD(thread); - int writeback = 1; + GLubyte return_value[10*1000]; + const GLubyte *extensions, *ext; + GET_THREAD(thread); + int writeback = 1; - if (pack_spu.swap) - { - crPackGetStringSWAP( GL_EXTENSIONS, return_value, &writeback ); - } - else - { - crPackGetString( GL_EXTENSIONS, return_value, &writeback ); - } - packspuFlush( (void *) thread ); + if (pack_spu.swap) + { + crPackGetStringSWAP( GL_EXTENSIONS, return_value, &writeback ); + } + else + { + crPackGetString( GL_EXTENSIONS, return_value, &writeback ); + } + packspuFlush( (void *) thread ); - while (writeback) - crNetRecv(); + while (writeback) + crNetRecv(); - CRASSERT(crStrlen((char *)return_value) < 10*1000); + CRASSERT(crStrlen((char *)return_value) < 10*1000); - /* OK, we got the result from the server. Now we have to - * intersect is with the set of extensions that Chromium understands - * and tack on the Chromium-specific extensions. - */ - extensions = return_value; - ext = crStateMergeExtensions(1, &extensions); + /* OK, we got the result from the server. Now we have to + * intersect is with the set of extensions that Chromium understands + * and tack on the Chromium-specific extensions. + */ + extensions = return_value; + ext = crStateMergeExtensions(1, &extensions); - return ext; /* XXX we should return a static string here! */ + return ext; /* XXX we should return a static string here! */ } @@ -48,24 +48,24 @@ GetVersionString(void) { - GLubyte return_value[100]; - GET_THREAD(thread); - int writeback = 1; - GLfloat version; + GLubyte return_value[100]; + GET_THREAD(thread); + int writeback = 1; + GLfloat version; - if (pack_spu.swap) - crPackGetStringSWAP( GL_VERSION, return_value, &writeback ); - else - crPackGetString( GL_VERSION, return_value, &writeback ); - packspuFlush( (void *) thread ); + if (pack_spu.swap) + crPackGetStringSWAP( GL_VERSION, return_value, &writeback ); + else + crPackGetString( GL_VERSION, return_value, &writeback ); + packspuFlush( (void *) thread ); - while (writeback) - crNetRecv(); + while (writeback) + crNetRecv(); - CRASSERT(crStrlen((char *)return_value) < 100); + CRASSERT(crStrlen((char *)return_value) < 100); - version = crStrToFloat((char *) return_value); - version = crStateComputeVersion(version); + version = crStrToFloat((char *) return_value); + version = crStateComputeVersion(version); - return version; + return version; } @@ -73,18 +73,18 @@ const GLubyte * PACKSPU_APIENTRY packspu_GetString( GLenum name ) { - GET_CONTEXT(ctx); - if (name == GL_EXTENSIONS) - { - return GetExtensions(); - } - else if (name == GL_VERSION) - { - float version = GetVersionString(); - sprintf(ctx->glVersion, "%g Chromium %s", version, CR_VERSION_STRING); - return (const GLubyte *) ctx->glVersion; - } - else - { - return crStateGetString(name); - } + GET_CONTEXT(ctx); + if (name == GL_EXTENSIONS) + { + return GetExtensions(); + } + else if (name == GL_VERSION) + { + float version = GetVersionString(); + sprintf(ctx->glVersion, "%g Chromium %s", version, CR_VERSION_STRING); + return (const GLubyte *) ctx->glVersion; + } + else + { + return crStateGetString(name); + } } Index: /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_init.c =================================================================== --- /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_init.c (revision 20082) +++ /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_init.c (revision 20083) @@ -15,7 +15,7 @@ SPUFunctions pack_functions = { - NULL, /* CHILD COPY */ - NULL, /* DATA */ - _cr_pack_table /* THE ACTUAL FUNCTIONS */ + NULL, /* CHILD COPY */ + NULL, /* DATA */ + _cr_pack_table /* THE ACTUAL FUNCTIONS */ }; @@ -29,34 +29,34 @@ static SPUFunctions * packSPUInit( int id, SPU *child, SPU *self, - unsigned int context_id, - unsigned int num_contexts ) + unsigned int context_id, + unsigned int num_contexts ) { - ThreadInfo *thread; + ThreadInfo *thread; - (void) context_id; - (void) num_contexts; - (void) child; - (void) self; + (void) context_id; + (void) num_contexts; + (void) child; + (void) self; #ifdef CHROMIUM_THREADSAFE - crInitMutex(&_PackMutex); + crInitMutex(&_PackMutex); #endif - pack_spu.id = id; + pack_spu.id = id; - packspuSetVBoxConfiguration( child ); + packspuSetVBoxConfiguration( child ); - /* This connects to the server, sets up the packer, etc. */ - thread = packspuNewThread( crThreadID() ); + /* This connects to the server, sets up the packer, etc. */ + thread = packspuNewThread( crThreadID() ); - if (!thread) { - return NULL; - } - CRASSERT( thread == &(pack_spu.thread[0]) ); + if (!thread) { + return NULL; + } + CRASSERT( thread == &(pack_spu.thread[0]) ); - packspuCreateFunctions(); - crStateInit(); + packspuCreateFunctions(); + crStateInit(); - return &pack_functions; + return &pack_functions; } @@ -64,5 +64,5 @@ packSPUSelfDispatch(SPUDispatchTable *self) { - (void)self; + (void)self; } @@ -70,5 +70,5 @@ packSPUCleanup(void) { - return 1; + return 1; } @@ -76,15 +76,15 @@ int SPULoad( char **name, char **super, SPUInitFuncPtr *init, - SPUSelfDispatchFuncPtr *self, SPUCleanupFuncPtr *cleanup, - SPUOptionsPtr *options, int *flags ) + SPUSelfDispatchFuncPtr *self, SPUCleanupFuncPtr *cleanup, + SPUOptionsPtr *options, int *flags ) { - *name = "pack"; - *super = NULL; - *init = packSPUInit; - *self = packSPUSelfDispatch; - *cleanup = packSPUCleanup; - *options = packSPUOptions; - *flags = (SPU_HAS_PACKER|SPU_IS_TERMINAL|SPU_MAX_SERVERS_ONE); + *name = "pack"; + *super = NULL; + *init = packSPUInit; + *self = packSPUSelfDispatch; + *cleanup = packSPUCleanup; + *options = packSPUOptions; + *flags = (SPU_HAS_PACKER|SPU_IS_TERMINAL|SPU_MAX_SERVERS_ONE); - return 1; + return 1; } Index: /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_misc.c =================================================================== --- /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_misc.c (revision 20082) +++ /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_misc.c (revision 20083) @@ -12,29 +12,29 @@ { - CRMessage msg; - int len; - - GET_THREAD(thread); + CRMessage msg; + int len; + + GET_THREAD(thread); - - switch(target) - { - case GL_GATHER_PACK_CR: - /* flush the current pack buffer */ - packspuFlush( (void *) thread ); + + switch(target) + { + case GL_GATHER_PACK_CR: + /* flush the current pack buffer */ + packspuFlush( (void *) thread ); - /* the connection is thread->server.conn */ - msg.header.type = CR_MESSAGE_GATHER; - msg.gather.offset = 69; - len = sizeof(CRMessageGather); - crNetSend(thread->netServer.conn, NULL, &msg, len); - break; - - default: - if (pack_spu.swap) - crPackChromiumParametervCRSWAP(target, type, count, values); - else - crPackChromiumParametervCR(target, type, count, values); - } + /* the connection is thread->server.conn */ + msg.header.type = CR_MESSAGE_GATHER; + msg.gather.offset = 69; + len = sizeof(CRMessageGather); + crNetSend(thread->netServer.conn, NULL, &msg, len); + break; + + default: + if (pack_spu.swap) + crPackChromiumParametervCRSWAP(target, type, count, values); + else + crPackChromiumParametervCR(target, type, count, values); + } @@ -43,21 +43,21 @@ void PACKSPU_APIENTRY packspu_Finish( void ) { - GET_THREAD(thread); - GLint writeback = pack_spu.thread[0].netServer.conn->actual_network; - if (pack_spu.swap) - { - crPackFinishSWAP( ); - if (writeback) - crPackWritebackSWAP( &writeback ); - } - else - { - crPackFinish( ); - if (writeback) - crPackWriteback( &writeback ); - } - packspuFlush( (void *) thread ); - while (writeback) - crNetRecv(); + GET_THREAD(thread); + GLint writeback = pack_spu.thread[0].netServer.conn->actual_network; + if (pack_spu.swap) + { + crPackFinishSWAP( ); + if (writeback) + crPackWritebackSWAP( &writeback ); + } + else + { + crPackFinish( ); + if (writeback) + crPackWriteback( &writeback ); + } + packspuFlush( (void *) thread ); + while (writeback) + crNetRecv(); } @@ -65,39 +65,39 @@ GLint PACKSPU_APIENTRY packspu_WindowCreate( const char *dpyName, GLint visBits ) { - static int num_calls = 0; - int writeback = pack_spu.thread[0].netServer.conn->actual_network; - GLint return_val = (GLint) 0; + static int num_calls = 0; + int writeback = pack_spu.thread[0].netServer.conn->actual_network; + GLint return_val = (GLint) 0; - /* WindowCreate is special - just like CreateContext. - * GET_THREAD(thread) doesn't work as the thread won't have called - * MakeCurrent yet, so we've got to use the first thread's packer - * buffer. - */ + /* WindowCreate is special - just like CreateContext. + * GET_THREAD(thread) doesn't work as the thread won't have called + * MakeCurrent yet, so we've got to use the first thread's packer + * buffer. + */ - crPackSetContext( pack_spu.thread[0].packer ); + crPackSetContext( pack_spu.thread[0].packer ); - if (pack_spu.swap) - { - crPackWindowCreateSWAP( dpyName, visBits, &return_val, &writeback ); - } - else - { - crPackWindowCreate( dpyName, visBits, &return_val, &writeback ); - } - packspuFlush( &pack_spu.thread[0] ); - if (!(pack_spu.thread[0].netServer.conn->actual_network)) - { - return num_calls++; - } - else - { - while (writeback) - crNetRecv(); - if (pack_spu.swap) - { - return_val = (GLint) SWAP32(return_val); - } - return return_val; - } + if (pack_spu.swap) + { + crPackWindowCreateSWAP( dpyName, visBits, &return_val, &writeback ); + } + else + { + crPackWindowCreate( dpyName, visBits, &return_val, &writeback ); + } + packspuFlush( &pack_spu.thread[0] ); + if (!(pack_spu.thread[0].netServer.conn->actual_network)) + { + return num_calls++; + } + else + { + while (writeback) + crNetRecv(); + if (pack_spu.swap) + { + return_val = (GLint) SWAP32(return_val); + } + return return_val; + } } @@ -106,40 +106,40 @@ GLboolean PACKSPU_APIENTRY packspu_AreTexturesResident( GLsizei n, const GLuint * textures, - GLboolean * residences ) + GLboolean * residences ) { - GET_THREAD(thread); - int writeback = 1; - GLboolean return_val = GL_TRUE; - GLsizei i; + GET_THREAD(thread); + int writeback = 1; + GLboolean return_val = GL_TRUE; + GLsizei i; - if (!(pack_spu.thread[0].netServer.conn->actual_network)) - { - crError( "packspu_AreTexturesResident doesn't work when there's no actual network involved!\nTry using the simplequery SPU in your chain!" ); - } + if (!(pack_spu.thread[0].netServer.conn->actual_network)) + { + crError( "packspu_AreTexturesResident doesn't work when there's no actual network involved!\nTry using the simplequery SPU in your chain!" ); + } - if (pack_spu.swap) - { - crPackAreTexturesResidentSWAP( n, textures, residences, &return_val, &writeback ); - } - else - { - crPackAreTexturesResident( n, textures, residences, &return_val, &writeback ); - } - packspuFlush( (void *) thread ); + if (pack_spu.swap) + { + crPackAreTexturesResidentSWAP( n, textures, residences, &return_val, &writeback ); + } + else + { + crPackAreTexturesResident( n, textures, residences, &return_val, &writeback ); + } + packspuFlush( (void *) thread ); - while (writeback) - crNetRecv(); + while (writeback) + crNetRecv(); - /* Since the Chromium packer/unpacker can't return both 'residences' - * and the function's return value, compute the return value here. - */ - for (i = 0; i < n; i++) { - if (!residences[i]) { - return_val = GL_FALSE; - break; - } - } + /* Since the Chromium packer/unpacker can't return both 'residences' + * and the function's return value, compute the return value here. + */ + for (i = 0; i < n; i++) { + if (!residences[i]) { + return_val = GL_FALSE; + break; + } + } - return return_val; + return return_val; } @@ -147,38 +147,38 @@ GLboolean PACKSPU_APIENTRY packspu_AreProgramsResidentNV( GLsizei n, const GLuint * ids, - GLboolean * residences ) + GLboolean * residences ) { - GET_THREAD(thread); - int writeback = 1; - GLboolean return_val = GL_TRUE; - GLsizei i; + GET_THREAD(thread); + int writeback = 1; + GLboolean return_val = GL_TRUE; + GLsizei i; - if (!(pack_spu.thread[0].netServer.conn->actual_network)) - { - crError( "packspu_AreProgramsResidentNV doesn't work when there's no actual network involved!\nTry using the simplequery SPU in your chain!" ); - } - if (pack_spu.swap) - { - crPackAreProgramsResidentNVSWAP( n, ids, residences, &return_val, &writeback ); - } - else - { - crPackAreProgramsResidentNV( n, ids, residences, &return_val, &writeback ); - } - packspuFlush( (void *) thread ); + if (!(pack_spu.thread[0].netServer.conn->actual_network)) + { + crError( "packspu_AreProgramsResidentNV doesn't work when there's no actual network involved!\nTry using the simplequery SPU in your chain!" ); + } + if (pack_spu.swap) + { + crPackAreProgramsResidentNVSWAP( n, ids, residences, &return_val, &writeback ); + } + else + { + crPackAreProgramsResidentNV( n, ids, residences, &return_val, &writeback ); + } + packspuFlush( (void *) thread ); - while (writeback) - crNetRecv(); + while (writeback) + crNetRecv(); - /* Since the Chromium packer/unpacker can't return both 'residences' - * and the function's return value, compute the return value here. - */ - for (i = 0; i < n; i++) { - if (!residences[i]) { - return_val = GL_FALSE; - break; - } - } + /* Since the Chromium packer/unpacker can't return both 'residences' + * and the function's return value, compute the return value here. + */ + for (i = 0; i < n; i++) { + if (!residences[i]) { + return_val = GL_FALSE; + break; + } + } - return return_val; + return return_val; } Index: /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_pixel.c =================================================================== --- /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_pixel.c (revision 20082) +++ /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_pixel.c (revision 20083) @@ -3,5 +3,5 @@ See the file LICENSE.txt for information on redistributing this software. */ - + #include "cr_packfunctions.h" #include "cr_glstate.h" @@ -13,85 +13,85 @@ void PACKSPU_APIENTRY packspu_PixelStoref( GLenum pname, GLfloat param ) { - /* NOTE: we do not send pixel store parameters to the server! - * When we pack a glDrawPixels or glTexImage2D image we interpret - * the user's pixel store parameters at that time and pack the - * image in a canonical layout (see util/pixel.c). - */ - crStatePixelStoref( pname, param ); + /* NOTE: we do not send pixel store parameters to the server! + * When we pack a glDrawPixels or glTexImage2D image we interpret + * the user's pixel store parameters at that time and pack the + * image in a canonical layout (see util/pixel.c). + */ + crStatePixelStoref( pname, param ); } void PACKSPU_APIENTRY packspu_PixelStorei( GLenum pname, GLint param ) { - crStatePixelStorei( pname, param ); + crStatePixelStorei( pname, param ); } void PACKSPU_APIENTRY packspu_DrawPixels( GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels ) { - GET_THREAD(thread); - ContextInfo *ctx = thread->currentContext; - CRClientState *clientState = &(ctx->clientState->client); - if (pack_spu.swap) - crPackDrawPixelsSWAP( width, height, format, type, pixels, &(clientState->unpack) ); - else - crPackDrawPixels( width, height, format, type, pixels, &(clientState->unpack) ); + GET_THREAD(thread); + ContextInfo *ctx = thread->currentContext; + CRClientState *clientState = &(ctx->clientState->client); + if (pack_spu.swap) + crPackDrawPixelsSWAP( width, height, format, type, pixels, &(clientState->unpack) ); + else + crPackDrawPixels( width, height, format, type, pixels, &(clientState->unpack) ); } void PACKSPU_APIENTRY packspu_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels ) { - GET_THREAD(thread); - ContextInfo *ctx = thread->currentContext; - CRClientState *clientState = &(ctx->clientState->client); - int writeback; - pack_spu.ReadPixels++; - if (pack_spu.swap) - crPackReadPixelsSWAP( x, y, width, height, format, type, pixels, - &(clientState->pack), &writeback ); - else - crPackReadPixels( x, y, width, height, format, type, pixels, - &(clientState->pack), &writeback ); - packspuFlush( (void *) thread ); - while (pack_spu.ReadPixels) - crNetRecv(); + GET_THREAD(thread); + ContextInfo *ctx = thread->currentContext; + CRClientState *clientState = &(ctx->clientState->client); + int writeback; + pack_spu.ReadPixels++; + if (pack_spu.swap) + crPackReadPixelsSWAP( x, y, width, height, format, type, pixels, + &(clientState->pack), &writeback ); + else + crPackReadPixels( x, y, width, height, format, type, pixels, + &(clientState->pack), &writeback ); + packspuFlush( (void *) thread ); + while (pack_spu.ReadPixels) + crNetRecv(); } void PACKSPU_APIENTRY packspu_CopyPixels( GLint x, GLint y, GLsizei width, GLsizei height, GLenum type ) { - GET_THREAD(thread); - if (pack_spu.swap) - crPackCopyPixelsSWAP( x, y, width, height, type ); - else - crPackCopyPixels( x, y, width, height, type ); - /* XXX why flush here? */ - packspuFlush( (void *) thread ); + GET_THREAD(thread); + if (pack_spu.swap) + crPackCopyPixelsSWAP( x, y, width, height, type ); + else + crPackCopyPixels( x, y, width, height, type ); + /* XXX why flush here? */ + packspuFlush( (void *) thread ); } void PACKSPU_APIENTRY packspu_Bitmap( GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap ) { - GET_CONTEXT(ctx); - CRClientState *clientState = &(ctx->clientState->client); - if (pack_spu.swap) - crPackBitmapSWAP( width, height, xorig, yorig, xmove, ymove, bitmap, &(clientState->unpack) ); - else - crPackBitmap( width, height, xorig, yorig, xmove, ymove, bitmap, &(clientState->unpack) ); + GET_CONTEXT(ctx); + CRClientState *clientState = &(ctx->clientState->client); + if (pack_spu.swap) + crPackBitmapSWAP( width, height, xorig, yorig, xmove, ymove, bitmap, &(clientState->unpack) ); + else + crPackBitmap( width, height, xorig, yorig, xmove, ymove, bitmap, &(clientState->unpack) ); } void PACKSPU_APIENTRY packspu_TexImage1D( GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels ) { - GET_CONTEXT(ctx); - CRClientState *clientState = &(ctx->clientState->client); - if (pack_spu.swap) - crPackTexImage1DSWAP( target, level, internalformat, width, border, format, type, pixels, &(clientState->unpack) ); - else - crPackTexImage1D( target, level, internalformat, width, border, format, type, pixels, &(clientState->unpack) ); + GET_CONTEXT(ctx); + CRClientState *clientState = &(ctx->clientState->client); + if (pack_spu.swap) + crPackTexImage1DSWAP( target, level, internalformat, width, border, format, type, pixels, &(clientState->unpack) ); + else + crPackTexImage1D( target, level, internalformat, width, border, format, type, pixels, &(clientState->unpack) ); } void PACKSPU_APIENTRY packspu_TexImage2D( GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels ) { - GET_CONTEXT(ctx); - CRClientState *clientState = &(ctx->clientState->client); - if (pack_spu.swap) - crPackTexImage2DSWAP( target, level, internalformat, width, height, border, format, type, pixels, &(clientState->unpack) ); - else - crPackTexImage2D( target, level, internalformat, width, height, border, format, type, pixels, &(clientState->unpack) ); + GET_CONTEXT(ctx); + CRClientState *clientState = &(ctx->clientState->client); + if (pack_spu.swap) + crPackTexImage2DSWAP( target, level, internalformat, width, height, border, format, type, pixels, &(clientState->unpack) ); + else + crPackTexImage2D( target, level, internalformat, width, height, border, format, type, pixels, &(clientState->unpack) ); } @@ -99,10 +99,10 @@ void PACKSPU_APIENTRY packspu_TexImage3DEXT( GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels ) { - GET_CONTEXT(ctx); - CRClientState *clientState = &(ctx->clientState->client); - if (pack_spu.swap) - crPackTexImage3DEXTSWAP( target, level, internalformat, width, height, depth, border, format, type, pixels, &(clientState->unpack) ); - else - crPackTexImage3DEXT( target, level, internalformat, width, height, depth, border, format, type, pixels, &(clientState->unpack) ); + GET_CONTEXT(ctx); + CRClientState *clientState = &(ctx->clientState->client); + if (pack_spu.swap) + crPackTexImage3DEXTSWAP( target, level, internalformat, width, height, depth, border, format, type, pixels, &(clientState->unpack) ); + else + crPackTexImage3DEXT( target, level, internalformat, width, height, depth, border, format, type, pixels, &(clientState->unpack) ); } #endif @@ -111,10 +111,10 @@ void PACKSPU_APIENTRY packspu_TexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels ) { - GET_CONTEXT(ctx); - CRClientState *clientState = &(ctx->clientState->client); - if (pack_spu.swap) - crPackTexImage3DSWAP( target, level, internalformat, width, height, depth, border, format, type, pixels, &(clientState->unpack) ); - else - crPackTexImage3D( target, level, internalformat, width, height, depth, border, format, type, pixels, &(clientState->unpack) ); + GET_CONTEXT(ctx); + CRClientState *clientState = &(ctx->clientState->client); + if (pack_spu.swap) + crPackTexImage3DSWAP( target, level, internalformat, width, height, depth, border, format, type, pixels, &(clientState->unpack) ); + else + crPackTexImage3D( target, level, internalformat, width, height, depth, border, format, type, pixels, &(clientState->unpack) ); } #endif /* CR_OPENGL_VERSION_1_2 */ @@ -122,20 +122,20 @@ void PACKSPU_APIENTRY packspu_TexSubImage1D( GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels ) { - GET_CONTEXT(ctx); - CRClientState *clientState = &(ctx->clientState->client); - if (pack_spu.swap) - crPackTexSubImage1DSWAP( target, level, xoffset, width, format, type, pixels, &(clientState->unpack) ); - else - crPackTexSubImage1D( target, level, xoffset, width, format, type, pixels, &(clientState->unpack) ); + GET_CONTEXT(ctx); + CRClientState *clientState = &(ctx->clientState->client); + if (pack_spu.swap) + crPackTexSubImage1DSWAP( target, level, xoffset, width, format, type, pixels, &(clientState->unpack) ); + else + crPackTexSubImage1D( target, level, xoffset, width, format, type, pixels, &(clientState->unpack) ); } void PACKSPU_APIENTRY packspu_TexSubImage2D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels ) { - GET_CONTEXT(ctx); - CRClientState *clientState = &(ctx->clientState->client); - if (pack_spu.swap) - crPackTexSubImage2DSWAP( target, level, xoffset, yoffset, width, height, format, type, pixels, &(clientState->unpack) ); - else - crPackTexSubImage2D( target, level, xoffset, yoffset, width, height, format, type, pixels, &(clientState->unpack) ); + GET_CONTEXT(ctx); + CRClientState *clientState = &(ctx->clientState->client); + if (pack_spu.swap) + crPackTexSubImage2DSWAP( target, level, xoffset, yoffset, width, height, format, type, pixels, &(clientState->unpack) ); + else + crPackTexSubImage2D( target, level, xoffset, yoffset, width, height, format, type, pixels, &(clientState->unpack) ); } @@ -143,10 +143,10 @@ void PACKSPU_APIENTRY packspu_TexSubImage3D( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels ) { - GET_CONTEXT(ctx); - CRClientState *clientState = &(ctx->clientState->client); - if (pack_spu.swap) - crPackTexSubImage3DSWAP( target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels, &(clientState->unpack) ); - else - crPackTexSubImage3D( target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels, &(clientState->unpack) ); + GET_CONTEXT(ctx); + CRClientState *clientState = &(ctx->clientState->client); + if (pack_spu.swap) + crPackTexSubImage3DSWAP( target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels, &(clientState->unpack) ); + else + crPackTexSubImage3D( target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels, &(clientState->unpack) ); } #endif /* CR_OPENGL_VERSION_1_2 */ @@ -154,28 +154,28 @@ void PACKSPU_APIENTRY packspu_ZPixCR( GLsizei width, GLsizei height, GLenum format, GLenum type, GLenum ztype, GLint zparm, GLint length, const GLvoid *pixels ) { - GET_CONTEXT(ctx); - CRClientState *clientState = &(ctx->clientState->client); - if (pack_spu.swap) - crPackZPixCRSWAP( width, height, format, type, ztype, zparm, length, pixels, &(clientState->unpack) ); - else - crPackZPixCR( width, height, format, type, ztype, zparm, length, pixels, &(clientState->unpack) ); + GET_CONTEXT(ctx); + CRClientState *clientState = &(ctx->clientState->client); + if (pack_spu.swap) + crPackZPixCRSWAP( width, height, format, type, ztype, zparm, length, pixels, &(clientState->unpack) ); + else + crPackZPixCR( width, height, format, type, ztype, zparm, length, pixels, &(clientState->unpack) ); } void PACKSPU_APIENTRY packspu_GetTexImage (GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels) { - GET_THREAD(thread); - ContextInfo *ctx = thread->currentContext; - CRClientState *clientState = &(ctx->clientState->client); - int writeback = 1; - /* XXX note: we're not observing the pixel pack parameters here. - * To do so, we'd have to allocate a temporary image buffer (how large???) - * and copy the image to the user's buffer using the pixel pack params. - */ - if (pack_spu.swap) - crPackGetTexImageSWAP( target, level, format, type, pixels, &(clientState->pack), &writeback ); - else - crPackGetTexImage( target, level, format, type, pixels, &(clientState->pack), &writeback ); - packspuFlush( (void *) thread ); - while (writeback) - crNetRecv(); + GET_THREAD(thread); + ContextInfo *ctx = thread->currentContext; + CRClientState *clientState = &(ctx->clientState->client); + int writeback = 1; + /* XXX note: we're not observing the pixel pack parameters here. + * To do so, we'd have to allocate a temporary image buffer (how large???) + * and copy the image to the user's buffer using the pixel pack params. + */ + if (pack_spu.swap) + crPackGetTexImageSWAP( target, level, format, type, pixels, &(clientState->pack), &writeback ); + else + crPackGetTexImage( target, level, format, type, pixels, &(clientState->pack), &writeback ); + packspuFlush( (void *) thread ); + while (writeback) + crNetRecv(); } Index: /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_proto.py =================================================================== --- /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_proto.py (revision 20082) +++ /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_proto.py (revision 20083) @@ -30,17 +30,17 @@ # make list of special functions for func_name in keys: - if ("get" in apiutil.Properties(func_name) or - apiutil.FindSpecial( "packspu", func_name ) or - apiutil.FindSpecial( "packspu_flush", func_name ) or - apiutil.FindSpecial( "packspu_vertex", func_name )): - pack_specials.append( func_name ) + if ("get" in apiutil.Properties(func_name) or + apiutil.FindSpecial( "packspu", func_name ) or + apiutil.FindSpecial( "packspu_flush", func_name ) or + apiutil.FindSpecial( "packspu_vertex", func_name )): + pack_specials.append( func_name ) for func_name in keys: - if apiutil.FindSpecial( "packspu_unimplemented", func_name ): - continue - if func_name in pack_specials: - return_type = apiutil.ReturnType(func_name) - params = apiutil.Parameters(func_name) - print 'extern %s PACKSPU_APIENTRY packspu_%s( %s );' % ( return_type, func_name, apiutil.MakeDeclarationString(params) ) + if apiutil.FindSpecial( "packspu_unimplemented", func_name ): + continue + if func_name in pack_specials: + return_type = apiutil.ReturnType(func_name) + params = apiutil.Parameters(func_name) + print 'extern %s PACKSPU_APIENTRY packspu_%s( %s );' % ( return_type, func_name, apiutil.MakeDeclarationString(params) ) Index: /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_swapbuf.c =================================================================== --- /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_swapbuf.c (revision 20082) +++ /trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_swapbuf.c (revision 20083) @@ -15,14 +15,14 @@ void PACKSPU_APIENTRY packspu_SwapBuffers( GLint window, GLint flags ) { - GET_THREAD(thread); - if (pack_spu.swap) - { - crPackSwapBuffersSWAP( window, flags ); - } - else - { - crPackSwapBuffers( window, flags ); - } - packspuFlush( (void *) thread ); + GET_THREAD(thread); + if (pack_spu.swap) + { + crPackSwapBuffersSWAP( window, flags ); + } + else + { + crPackSwapBuffers( window, flags ); + } + packspuFlush( (void *) thread ); } @@ -32,73 +32,73 @@ void PACKSPU_APIENTRY packspu_SwapBuffers( GLint window, GLint flags ) { - GET_THREAD(thread); + GET_THREAD(thread); - if (pack_spu.swap) - { - crPackSwapBuffersSWAP( window, flags ); - } - else - { - crPackSwapBuffers( window, flags ); - } - packspuFlush( (void *) thread ); + if (pack_spu.swap) + { + crPackSwapBuffersSWAP( window, flags ); + } + else + { + crPackSwapBuffers( window, flags ); + } + packspuFlush( (void *) thread ); - if (!(thread->netServer.conn->actual_network)) - { - /* no synchronization needed */ - return; - } + if (!(thread->netServer.conn->actual_network)) + { + /* no synchronization needed */ + return; + } - if (pack_spu.swapbuffer_sync) { - /* This won't block unless there has been more than 1 frame - * since we received a writeback acknowledgement. In the - * normal case there's no performance penalty for doing this - * (beyond the cost of packing the writeback request into the - * stream and receiving the reply), but it eliminates the - * problem of runaway rendering that can occur, eg when - * rendering frames consisting of a single large display list - * in a tight loop. - * - * Note that this is *not* the same as doing a sync after each - * swapbuffers, which would force a round-trip 'bubble' into - * the network stream under normal conditions. - * - * This is complicated because writeback in the pack spu is - * overriden to always set the value to zero when the - * reply is received, rather than decrementing it: - */ - switch( thread->writeback ) { - case 0: - /* Request writeback. - */ - thread->writeback = 1; - if (pack_spu.swap) - { - crPackWritebackSWAP( (GLint *) &thread->writeback ); - } - else - { - crPackWriteback( (GLint *) &thread->writeback ); - } - break; - case 1: - /* Make sure writeback from previous frame has been received. - */ - while (thread->writeback) - { - crNetRecv(); - } - break; - } - } + if (pack_spu.swapbuffer_sync) { + /* This won't block unless there has been more than 1 frame + * since we received a writeback acknowledgement. In the + * normal case there's no performance penalty for doing this + * (beyond the cost of packing the writeback request into the + * stream and receiving the reply), but it eliminates the + * problem of runaway rendering that can occur, eg when + * rendering frames consisting of a single large display list + * in a tight loop. + * + * Note that this is *not* the same as doing a sync after each + * swapbuffers, which would force a round-trip 'bubble' into + * the network stream under normal conditions. + * + * This is complicated because writeback in the pack spu is + * overriden to always set the value to zero when the + * reply is received, rather than decrementing it: + */ + switch( thread->writeback ) { + case 0: + /* Request writeback. + */ + thread->writeback = 1; + if (pack_spu.swap) + { + crPackWritebackSWAP( (GLint *) &thread->writeback ); + } + else + { + crPackWriteback( (GLint *) &thread->writeback ); + } + break; + case 1: + /* Make sure writeback from previous frame has been received. + */ + while (thread->writeback) + { + crNetRecv(); + } + break; + } + } - /* want to emit a parameteri here */ - if (pack_spu.emit_GATHER_POST_SWAPBUFFERS) - { - if (pack_spu.swap) - crPackChromiumParameteriCRSWAP(GL_GATHER_POST_SWAPBUFFERS_CR, 1); - else - crPackChromiumParameteriCR(GL_GATHER_POST_SWAPBUFFERS_CR, 1); - } + /* want to emit a parameteri here */ + if (pack_spu.emit_GATHER_POST_SWAPBUFFERS) + { + if (pack_spu.swap) + crPackChromiumParameteriCRSWAP(GL_GATHER_POST_SWAPBUFFERS_CR, 1); + else + crPackChromiumParameteriCR(GL_GATHER_POST_SWAPBUFFERS_CR, 1); + } }