Changeset 62814 in vbox for trunk/src/VBox/GuestHost
- Timestamp:
- Aug 1, 2016 12:51:52 PM (9 years ago)
- svn:sync-xref-src-repo-rev:
- 109401
- Location:
- trunk/src/VBox/GuestHost/OpenGL
- Files:
-
- 19 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/GuestHost/OpenGL/packer/pack_pixels.c
r52451 r62814 118 118 unsigned char *data_ptr; 119 119 int data_length = 0; 120 GLubyte *destBitmap = NULL;120 /*GLubyte *destBitmap = NULL; - unused */ 121 121 int packet_length = 122 122 sizeof( width ) + … … 210 210 CR_GET_PACKER_CONTEXT(pc); 211 211 unsigned char *data_ptr; 212 (void) pc; 212 (void) pc; (void) packstate; 213 213 CR_GET_BUFFERED_POINTER( pc, 40 ); 214 214 WRITE_DATA( 0, GLint, 40 ); -
trunk/src/VBox/GuestHost/OpenGL/packer/pack_shaders.c
r62492 r62814 476 476 CR_GET_PACKER_CONTEXT(pc); 477 477 unsigned char *data_ptr; 478 (void) pc; 478 (void) pc; (void) obj; 479 479 CR_GET_BUFFERED_POINTER(pc, 32); 480 480 WRITE_DATA(0, GLint, 32); … … 493 493 CR_GET_PACKER_CONTEXT(pc); 494 494 unsigned char *data_ptr; 495 (void) pc; 495 (void) pc; (void) infoLog; 496 496 CR_GET_BUFFERED_POINTER(pc, 32); 497 497 WRITE_DATA(0, GLint, 32); -
trunk/src/VBox/GuestHost/OpenGL/packer/pack_visibleregion.c
r62812 r62814 53 53 void PACK_APIENTRY crPackWindowVisibleRegionSWAP( CR_PACKER_CONTEXT_ARGDECL GLint window, GLint cRects, const GLint * pRects ) 54 54 { 55 RT_NOREF3(window, cRects, pRects); 55 56 crError( "crPackWindowVisibleRegionSWAP unimplemented and shouldn't be called" ); 56 57 } -
trunk/src/VBox/GuestHost/OpenGL/spu_loader/spuchange.py
r36231 r62814 66 66 print '\t{' 67 67 print '\t\tcrDebug("%%s changed from %%p to %%p", "gl%s", dispatch->%s, func);' % (func_name, func_name) 68 print '\t\tcrSPUChangeInterface(dispatch, dispatch->%s, func);' % func_name68 print '\t\tcrSPUChangeInterface(dispatch, (void *)dispatch->%s, func);' % func_name 69 69 print '\t}\n' 70 70 print """ -
trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_diff.c
r55798 r62814 143 143 int crStateAcquireFBImage(CRContext *to, CRFBData *data) 144 144 { 145 CRBufferState *pBuf = &to->buffer;145 /*CRBufferState *pBuf = &to->buffer; - unused */ 146 146 CRPixelPackState packing = to->client.pack; 147 147 uint32_t i; … … 280 280 { 281 281 { 282 CRBufferState *pBuf = &to->buffer;282 /*CRBufferState *pBuf = &to->buffer; - unused */ 283 283 CRPixelPackState unpack = to->client.unpack; 284 284 uint32_t i; … … 597 597 } 598 598 599 GLenum crStateCleanHWErrorState( )599 GLenum crStateCleanHWErrorState(void) 600 600 { 601 601 GLenum err; -
trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_framebuffer.c
r62492 r62814 592 592 593 593 CRSTATE_CHECKERR_RET(level<0, GL_INVALID_VALUE, "level<0", 0); 594 CRSTATE_CHECKERR_RET( level>maxtexsizelog2, GL_INVALID_VALUE, "level too big", 0);594 CRSTATE_CHECKERR_RET((GLuint)level>maxtexsizelog2, GL_INVALID_VALUE, "level too big", 0); 595 595 596 596 #ifdef IN_GUEST … … 703 703 } 704 704 705 CRSTATE_CHECKERR(zoffset>( g->limits.max3DTextureSize-1), GL_INVALID_VALUE, "zoffset too big");705 CRSTATE_CHECKERR(zoffset>((GLint)g->limits.max3DTextureSize-1), GL_INVALID_VALUE, "zoffset too big"); 706 706 CRSTATE_CHECKERR(textarget!=GL_TEXTURE_3D, GL_INVALID_OPERATION, "textarget"); 707 707 -
trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c
r62492 r62814 55 55 CRASSERT(pSSM && pBuffer && cbBuffer>0); 56 56 57 *pBuffer = crAlloc( cbBuffer);57 *pBuffer = crAlloc((unsigned int /* this case is just so stupid */)cbBuffer); 58 58 if (!*pBuffer) 59 59 return VERR_NO_MEMORY; … … 779 779 if (bReallocMem) 780 780 { 781 pEval[i].coeff = (GLfloat*) crAlloc( size);781 pEval[i].coeff = (GLfloat*) crAlloc((unsigned int /* this case is just so stupid */)size); 782 782 if (!pEval[i].coeff) return VERR_NO_MEMORY; 783 783 } … … 802 802 if (bReallocMem) 803 803 { 804 pEval[i].coeff = (GLfloat*) crAlloc( size);804 pEval[i].coeff = (GLfloat*) crAlloc((unsigned int /* this case is just so stupid */)size); 805 805 if (!pEval[i].coeff) return VERR_NO_MEMORY; 806 806 } … … 1455 1455 } 1456 1456 } 1457 1458 return rc; 1457 /* not reached*/ 1459 1458 } 1460 1459 … … 2650 2649 2651 2650 datasize = crStateGetUniformSize(pProgram->pUniforms[k].type)*itemsize; 2652 pProgram->pUniforms[k].data = crAlloc( datasize);2651 pProgram->pUniforms[k].data = crAlloc((unsigned int /* this case is just so stupid */)datasize); 2653 2652 if (!pProgram->pUniforms[k].data) return VERR_NO_MEMORY; 2654 2653 -
trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_stencil.c
r44332 r62814 42 42 return 0; 43 43 } 44 #ifndef VBOX /* unreachable */ 44 45 crError("should never be here!"); 45 46 return 0; 47 #endif 46 48 } 47 49 -
trunk/src/VBox/GuestHost/OpenGL/util/blitter.cpp
r62492 r62814 193 193 } 194 194 195 if ( srcX >= pSrc->width)195 if ((GLuint)srcX >= pSrc->width) 196 196 { 197 197 WARN(("ups")); … … 199 199 } 200 200 201 if ( srcY >= pSrc->height)201 if ((GLuint)srcY >= pSrc->height) 202 202 { 203 203 WARN(("ups")); … … 218 218 int32_t UnscaledSrcHeight = UnscaledCopyRect.yBottom - UnscaledCopyRect.yTop; 219 219 220 if (UnscaledSrcWidth + srcX > pSrc->width)220 if (UnscaledSrcWidth + srcX > (GLint)pSrc->width) 221 221 UnscaledSrcWidth = pSrc->width - srcX; 222 222 223 if (UnscaledSrcHeight + srcY > pSrc->height)223 if (UnscaledSrcHeight + srcY > (GLint)pSrc->height) 224 224 UnscaledSrcHeight = pSrc->height - srcY; 225 225 -
trunk/src/VBox/GuestHost/OpenGL/util/error.c
r62812 r62814 43 43 * See also VBoxDeps.cpp in iprt and xpcom. 44 44 */ 45 #ifdef _MSC_VER 46 # pragma warning(push) 47 # pragma warning(disable:4232) /* nonstandard extension used: 'g_VBoxRTDeps' : address of dllimport 'RTBldCfgRevision' is not static, identiy not guaranteed */ 48 #endif 45 49 PFNRT g_VBoxRTDeps[] = 46 50 { … … 51 55 (PFNRT)RTBldCfgRevision, 52 56 }; 57 #ifdef _MSC_VER 58 # pragma warning(pop) 59 #endif 53 60 54 61 … … 171 178 BOOL WINAPI DllMain(HINSTANCE hDLLInst, DWORD fdwReason, LPVOID lpvReserved) 172 179 { 173 (void) lpvReserved; 180 (void) lpvReserved; (void) hDLLInst; 174 181 175 182 switch (fdwReason) -
trunk/src/VBox/GuestHost/OpenGL/util/hash.c
r56566 r62814 572 572 { 573 573 GLuint res; 574 int i;575 574 576 575 #ifdef CHROMIUM_THREADSAFE … … 579 578 res = crHashIdPoolAllocBlock (h->idPool, range); 580 579 #ifdef DEBUG_misha 581 Assert(res); 582 for (i = 0; i < range; ++i) 583 { 584 void *search = crHashtableSearch( h, res+i ); 585 Assert(!search); 580 { 581 int i; 582 Assert(res); 583 for (i = 0; i < range; ++i) 584 { 585 void *search = crHashtableSearch( h, res+i ); 586 Assert(!search); 587 } 586 588 } 587 589 #endif -
trunk/src/VBox/GuestHost/OpenGL/util/htable.cpp
r62492 r62814 1 1 /* $Id$ */ 2 3 2 /** @file 4 3 * uint32_t handle to void simple table impl 4 * 5 * @todo Why couldn't you simply use iprt/handletable.h? 5 6 */ 6 7 … … 16 17 * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. 17 18 */ 19 18 20 #include <iprt/cdefs.h> 19 21 #include <iprt/asm.h> … … 162 164 } 163 165 } 164 WARN(("should not be here")); 165 return CRHTABLE_HANDLE_INVALID; 166 /* not reached */ 166 167 } 167 168 -
trunk/src/VBox/GuestHost/OpenGL/util/list.c
r61991 r62814 3 3 #include "cr_mem.h" 4 4 5 #ifndef CR_TESTING_LIST /* vbox */ 6 # define CR_TESTING_LIST 0 /* vbox */ 7 #endif /* vbox */ 5 8 #if CR_TESTING_LIST 6 9 #include <stdio.h> -
trunk/src/VBox/GuestHost/OpenGL/util/mem.c
r57542 r62814 64 64 return _crAlloc(nbytes); 65 65 #else 66 RT_NOREF2(file, line); 66 67 return crAlloc(nbytes); 67 68 #endif … … 94 95 return _crCalloc(nbytes); 95 96 #else 97 RT_NOREF2(file, line); 96 98 return crCalloc(nbytes); 97 99 #endif -
trunk/src/VBox/GuestHost/OpenGL/util/pixel.c
r62809 r62814 1857 1857 { 1858 1858 va_list va; 1859 int rc;1860 1859 va_start(va, fname); 1861 1860 crDumpNamedTGAV(w, h, data, fname, va); -
trunk/src/VBox/GuestHost/OpenGL/util/tcpip.c
r61992 r62814 7 7 #ifdef WINDOWS 8 8 #define WIN32_LEAN_AND_MEAN 9 # ifdef VBOX 10 # include <iprt/win/winsock2.h> 11 # else /* !VBOX */ 9 12 #pragma warning( push, 3 ) 10 13 #include <winsock2.h> … … 12 15 #pragma warning( disable : 4514 ) 13 16 #pragma warning( disable : 4127 ) 14 # ifndef VBOX15 17 typedef int ssize_t; 16 # endif 18 # endif /* !VBOX */ 17 19 #else 18 20 #include <sys/types.h> … … 60 62 61 63 #ifdef WINDOWS 64 # undef EADDRINUSE 62 65 #define EADDRINUSE WSAEADDRINUSE 66 # undef ECONNREFUSED 63 67 #define ECONNREFUSED WSAECONNREFUSED 64 68 #endif -
trunk/src/VBox/GuestHost/OpenGL/util/threads.c
r55011 r62814 250 250 { 251 251 /* XXX anything to do? */ 252 (void)b; 252 253 } 253 254 … … 258 259 DWORD dwEvent 259 260 = WaitForMultipleObjects( b->count, b->hEvents, FALSE, INFINITE ); 261 (void)dwEvent; 260 262 #else 261 263 pthread_mutex_lock( &(b->mutex) ); … … 276 278 { 277 279 #ifdef WINDOWS 280 (void) s; (void) count; 278 281 crWarning("CRsemaphore functions not implemented on Windows"); 279 282 #else … … 287 290 #ifdef WINDOWS 288 291 /* to do */ 292 (void) s; 289 293 #else 290 294 sem_wait(s); … … 297 301 #ifdef WINDOWS 298 302 /* to do */ 303 (void) s; 299 304 #else 300 305 sem_post(s); -
trunk/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c
r62812 r62814 1466 1466 return RT_SUCCESS(rc); 1467 1467 } 1468 else 1469 { 1470 crDebug("HGCM connect failed with rc=0x%x\n", info.result); 1471 1472 VBOXCRHGSMIPROFILE_FUNC_EPILOGUE(); 1473 return FALSE; 1474 } 1475 } 1476 else 1477 { 1468 crDebug("HGCM connect failed with rc=0x%x\n", info.result); 1469 1470 VBOXCRHGSMIPROFILE_FUNC_EPILOGUE(); 1471 return FALSE; 1472 } 1478 1473 #ifdef RT_OS_WINDOWS 1474 { 1479 1475 DWORD winEr = GetLastError(); 1480 1476 crDebug("IOCTL for HGCM connect failed with rc=0x%x\n", winEr); 1477 } 1481 1478 #else 1482 crDebug("IOCTL for HGCM connect failed with rc=0x%x\n", errno); 1483 #endif 1484 VBOXCRHGSMIPROFILE_FUNC_EPILOGUE(); 1485 return FALSE; 1486 } 1487 1479 crDebug("IOCTL for HGCM connect failed with rc=0x%x\n", errno); 1480 #endif 1488 1481 VBOXCRHGSMIPROFILE_FUNC_EPILOGUE(); 1489 1482 return FALSE; … … 2014 2007 { 2015 2008 int rc; 2016 int32_t callRes ;2009 int32_t callRes = VINF_SUCCESS; /* Shut up MSC. */ 2017 2010 VBOXUHGSMI_BUFFER_SUBMIT aSubmit[2]; 2018 2011 -
trunk/src/VBox/GuestHost/OpenGL/util/vreg.cpp
r62683 r62814 730 730 } 731 731 732 #if 0 /* unused */ 732 733 static DECLCALLBACK(PRTLISTNODE) vboxVrListIntersectNoJoinIntersectedCb(PVBOXVR_LIST pList1, PVBOXVR_REG pReg1, PCRTRECT pRect2, 733 734 void *pvContext, PPRTLISTNODE ppNext) 734 735 { 736 RT_NOREF1(ppNext); 735 737 PVBOXVR_CBDATA_SUBST pData = (PVBOXVR_CBDATA_SUBST)pvContext; 736 738 pData->fChanged = true; … … 753 755 return &pReg1->ListEntry; 754 756 } 757 #endif 755 758 756 759 static int vboxVrListIntersectNoJoin(PVBOXVR_LIST pList, PCVBOXVR_LIST pList2, bool *pfChanged)
Note:
See TracChangeset
for help on using the changeset viewer.