Changeset 63205 in vbox for trunk/src/VBox/Additions
- Timestamp:
- Aug 9, 2016 2:03:04 PM (8 years ago)
- Location:
- trunk/src/VBox/Additions/common/crOpenGL
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/common/crOpenGL/array/arrayspu.c
r40431 r63205 882 882 883 883 static void ARRAYSPU_APIENTRY 884 arrayspu_VBoxAttachThread( )884 arrayspu_VBoxAttachThread(void) 885 885 { 886 886 crStateVBoxAttachThread(); … … 889 889 890 890 static void ARRAYSPU_APIENTRY 891 arrayspu_VBoxDetachThread( )891 arrayspu_VBoxDetachThread(void) 892 892 { 893 893 crStateVBoxDetachThread(); -
trunk/src/VBox/Additions/common/crOpenGL/entrypoints.py
r18539 r63205 31 31 print '#include "dri_glx.h"' 32 32 print '' 33 print '#ifdef __GNUC__'; 34 print '# if (__GNUC__ << 16) + __GNUC_MINOR__ >= 0x40002'; 35 print '# pragma GCC diagnostic ignored "-Wunused-parameter"'; 36 print '# endif'; 37 print '#endif'; 38 33 39 34 40 # Get sorted list of dispatched functions. -
trunk/src/VBox/Additions/common/crOpenGL/pack/packspu.h
r62848 r63205 169 169 #if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST) 170 170 struct VBOXUHGSMI *pHgsmi 171 #else 172 void 171 173 #endif 172 174 ); -
trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_client.c
r51316 r63205 181 181 182 182 183 GLboolean packspuZvaCreate(ContextInfo *pCtx, const GLfloat *pValue, GLuint cValues)183 static GLboolean packspuZvaCreate(ContextInfo *pCtx, const GLfloat *pValue, GLuint cValues) 184 184 { 185 185 ZvaBufferInfo *pInfo = &pCtx->zvaBufferInfo; … … 244 244 } CR_ZVA_RESTORE_CTX; 245 245 246 void packspuZvaEnable(ContextInfo *pCtx, const GLfloat *pValue, GLuint cValues, CR_ZVA_RESTORE_CTX *pRestoreCtx)246 static void packspuZvaEnable(ContextInfo *pCtx, const GLfloat *pValue, GLuint cValues, CR_ZVA_RESTORE_CTX *pRestoreCtx) 247 247 { 248 248 CRContext *g = pCtx->clientState; … … 281 281 } 282 282 283 void packspuZvaDisable(CR_ZVA_RESTORE_CTX *pRestoreCtx)283 static void packspuZvaDisable(CR_ZVA_RESTORE_CTX *pRestoreCtx) 284 284 { 285 285 if (pRestoreCtx->cp.buffer) … … 347 347 348 348 #if CR_ARB_vertex_buffer_object 349 GET_CONTEXT(ctx); 350 /*crDebug("packspu_ArrayElement index:%i", index);*/ 351 if (ctx->clientState->extensions.ARB_vertex_buffer_object) 352 { 353 serverArrays = crStateUseServerArrays(); 354 if (ctx->fCheckZerroVertAttr) 355 cZvaValues = crStateNeedDummyZeroVertexArray(thread->currentContext->clientState, &thread->packer->current, aAttrib); 349 { 350 GET_CONTEXT(ctx); 351 /*crDebug("packspu_ArrayElement index:%i", index);*/ 352 if (ctx->clientState->extensions.ARB_vertex_buffer_object) 353 { 354 serverArrays = crStateUseServerArrays(); 355 if (ctx->fCheckZerroVertAttr) 356 cZvaValues = crStateNeedDummyZeroVertexArray(thread->currentContext->clientState, &thread->packer->current, aAttrib); 357 } 356 358 } 357 359 #endif … … 428 430 429 431 #if CR_ARB_vertex_buffer_object 430 GET_CONTEXT(ctx);431 432 GLboolean lockedArrays = GL_FALSE; 432 CRBufferObject *elementsBuffer = crStateGetCurrent()->bufferobject.elementsBuffer; 433 /*crDebug("DrawElements count=%d, indices=%p", count, indices);*/ 434 if (ctx->clientState->extensions.ARB_vertex_buffer_object) 435 { 436 serverArrays = crStateUseServerArrays(); 437 if (ctx->fCheckZerroVertAttr) 438 cZvaValues = crStateNeedDummyZeroVertexArray(thread->currentContext->clientState, &thread->packer->current, aAttrib); 433 CRBufferObject *elementsBuffer; 434 { 435 GET_CONTEXT(ctx); 436 elementsBuffer = crStateGetCurrent()->bufferobject.elementsBuffer; 437 /*crDebug("DrawElements count=%d, indices=%p", count, indices);*/ 438 if (ctx->clientState->extensions.ARB_vertex_buffer_object) 439 { 440 serverArrays = crStateUseServerArrays(); 441 if (ctx->fCheckZerroVertAttr) 442 cZvaValues = crStateNeedDummyZeroVertexArray(thread->currentContext->clientState, &thread->packer->current, aAttrib); 443 } 439 444 } 440 445 … … 576 581 577 582 #if CR_ARB_vertex_buffer_object 578 GET_CONTEXT(ctx); 579 /*crDebug("DrawRangeElements count=%d", count);*/ 580 if (ctx->clientState->extensions.ARB_vertex_buffer_object) 581 { 582 serverArrays = crStateUseServerArrays(); 583 if (ctx->fCheckZerroVertAttr) 584 cZvaValues = crStateNeedDummyZeroVertexArray(thread->currentContext->clientState, &thread->packer->current, aAttrib); 583 { 584 GET_CONTEXT(ctx); 585 /*crDebug("DrawRangeElements count=%d", count);*/ 586 if (ctx->clientState->extensions.ARB_vertex_buffer_object) 587 { 588 serverArrays = crStateUseServerArrays(); 589 if (ctx->fCheckZerroVertAttr) 590 cZvaValues = crStateNeedDummyZeroVertexArray(thread->currentContext->clientState, &thread->packer->current, aAttrib); 591 } 585 592 } 586 593 #endif … … 650 657 651 658 #if CR_ARB_vertex_buffer_object 652 GET_CONTEXT(ctx);653 659 GLboolean lockedArrays = GL_FALSE; 654 /*crDebug("DrawArrays count=%d", count);*/ 655 if (ctx->clientState->extensions.ARB_vertex_buffer_object) 656 { 657 serverArrays = crStateUseServerArrays(); 658 if (ctx->fCheckZerroVertAttr) 659 cZvaValues = crStateNeedDummyZeroVertexArray(thread->currentContext->clientState, &thread->packer->current, aAttrib); 660 { 661 GET_CONTEXT(ctx); 662 /*crDebug("DrawArrays count=%d", count);*/ 663 if (ctx->clientState->extensions.ARB_vertex_buffer_object) 664 { 665 serverArrays = crStateUseServerArrays(); 666 if (ctx->fCheckZerroVertAttr) 667 cZvaValues = crStateNeedDummyZeroVertexArray(thread->currentContext->clientState, &thread->packer->current, aAttrib); 668 } 660 669 } 661 670 -
trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_config.c
r33595 r63205 25 25 static void set_emit( void *foo, const char *response ) 26 26 { 27 RT_NOREF(foo); 27 28 sscanf( response, "%d", &(pack_spu.emit_GATHER_POST_SWAPBUFFERS) ); 28 29 } … … 30 31 static void set_swapbuffer_sync( void *foo, const char *response ) 31 32 { 33 RT_NOREF(foo); 32 34 sscanf( response, "%d", &(pack_spu.swapbuffer_sync) ); 33 35 } … … 50 52 void packspuSetVBoxConfiguration( const SPU *child_spu ) 51 53 { 54 RT_NOREF(child_spu); 52 55 __setDefaults(); 53 56 pack_spu.emit_GATHER_POST_SWAPBUFFERS = 0; -
trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_context.c
r55623 r63205 21 21 #if defined(VBOX_WITH_CRHGSMI) && defined(IN_GUEST) 22 22 struct VBOXUHGSMI *pHgsmi 23 #else 24 void 23 25 #endif 24 26 ) … … 116 118 } 117 119 crError("packspuNewThread failed"); 120 #else 121 RT_NOREF(pHgsmi); 118 122 #endif 119 123 return 0; … … 130 134 packspuFlush((void *) thread); 131 135 #else 136 RT_NOREF(con); 132 137 crError("VBoxConFlush not implemented!"); 133 138 #endif … … 180 185 #endif 181 186 crUnlockMutex(&_PackMutex); 187 #else 188 RT_NOREF(con); 182 189 #endif 183 190 } … … 189 196 CRPackContext * curPacker = crPackGetContext(); 190 197 ThreadInfo *curThread = thread; 191 int writeback = 1;192 GLint serverCtx = (GLint) -1;193 198 194 199 CRASSERT(!curThread == !curPacker); … … 247 252 CRPackContext * curPacker = crPackGetContext(); 248 253 ThreadInfo *curThread = thread; 249 int writeback = 1;250 GLint serverCtx = (GLint) -1;251 254 252 255 CRASSERT(!curThread == !curPacker); -
trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_misc.c
r62848 r63205 552 552 GLenum return_val = (GLenum) 0; 553 553 CRContext *pCurState = crStateGetCurrent(); 554 NOREF(pCurState); /* it's unused, but I don't know about side effects.. */ 554 555 555 556 if (!CRPACKSPU_IS_WDDM_CRHGSMI() && !(pack_spu.thread[pack_spu.idxThreadInUse].netServer.conn->actual_network)) … … 584 585 GET_THREAD(thread); 585 586 CRASSERT(!thread); 587 RT_NOREF(pHgsmi); 586 588 crLockMutex(&_PackMutex); 587 589 { … … 842 844 #endif /*CHROMIUM_THREADSAFE*/ 843 845 844 void PACKSPU_APIENTRY packspu_VBoxPresentComposition(GLint win, const struct VBOXVR_SCR_COMPOSITOR * pCompositor, const struct VBOXVR_SCR_COMPOSITOR_ENTRY *pChangedEntry) 845 { 846 void PACKSPU_APIENTRY packspu_VBoxPresentComposition(GLint win, const struct VBOXVR_SCR_COMPOSITOR * pCompositor, 847 const struct VBOXVR_SCR_COMPOSITOR_ENTRY *pChangedEntry) 848 { 849 RT_NOREF(win, pCompositor, pChangedEntry); 846 850 } 847 851 848 852 void PACKSPU_APIENTRY packspu_StringMarkerGREMEDY(GLsizei len, const GLvoid *string) 849 853 { 850 } 851 854 RT_NOREF(len, string); 855 } 856 -
trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_net.c
r52451 r63205 54 54 packspuReceiveData( CRConnection *conn, CRMessage *msg, unsigned int len ) 55 55 { 56 RT_NOREF(conn); 56 57 if (msg->header.type == CR_MESSAGE_REDIR_PTR) 57 58 msg = (CRMessage*) msg->redirptr.pMessage; … … 80 81 int num_opcodes; 81 82 CRMessageOpcodes *hdr; 83 RT_NOREF(senderID); 82 84 83 85 CRASSERT( buf ); -
trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_pixel.c
r42499 r63205 198 198 } 199 199 200 static void packspu_ApplyUnpackState( )200 static void packspu_ApplyUnpackState(void) 201 201 { 202 202 GET_THREAD(thread); … … 214 214 } 215 215 216 static void packspu_RestoreUnpackState( )216 static void packspu_RestoreUnpackState(void) 217 217 { 218 218 GET_THREAD(thread); … … 230 230 } 231 231 232 static void packspu_ApplyPackState( )232 static void packspu_ApplyPackState(void) 233 233 { 234 234 GET_THREAD(thread); … … 246 246 } 247 247 248 static void packspu_RestorePackState( )248 static void packspu_RestorePackState(void) 249 249 { 250 250 GET_THREAD(thread);
Note:
See TracChangeset
for help on using the changeset viewer.