diff options
| author | Timothy Arceri <[email protected]> | 2017-03-05 12:32:06 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-03-07 08:53:05 +1100 |
| commit | 628e84a58fdb26c63a705861b92f65f242613321 (patch) | |
| tree | bd6084a4dee53a1f180c62f41e790ab490ddf3ee /src/gallium/state_trackers | |
| parent | ba72554f3e576c1674d52ab16d8d2edff9398b71 (diff) | |
gallium/util: replace pipe_mutex_unlock() with mtx_unlock()
pipe_mutex_unlock() was made unnecessary with fd33a6bcd7f12.
Replaced using:
find ./src -type f -exec sed -i -- \
's:pipe_mutex_unlock(\([^)]*\)):mtx_unlock(\&\1):g' {} \;
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers')
21 files changed, 408 insertions, 408 deletions
diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c index da663b260d4..b50e0964431 100644 --- a/src/gallium/state_trackers/dri/dri2.c +++ b/src/gallium/state_trackers/dri/dri2.c @@ -1434,7 +1434,7 @@ dri2_load_opencl_interop(struct dri_screen *screen) mtx_lock(&screen->opencl_func_mutex); if (dri2_is_opencl_interop_loaded_locked(screen)) { - pipe_mutex_unlock(screen->opencl_func_mutex); + mtx_unlock(&screen->opencl_func_mutex); return true; } @@ -1448,7 +1448,7 @@ dri2_load_opencl_interop(struct dri_screen *screen) dlsym(RTLD_DEFAULT, "opencl_dri_event_get_fence"); success = dri2_is_opencl_interop_loaded_locked(screen); - pipe_mutex_unlock(screen->opencl_func_mutex); + mtx_unlock(&screen->opencl_func_mutex); return success; #else return false; diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c index 86bb1c44ba3..398152e09b3 100644 --- a/src/gallium/state_trackers/glx/xlib/xm_api.c +++ b/src/gallium/state_trackers/glx/xlib/xm_api.c @@ -204,7 +204,7 @@ xmesa_init_display( Display *display ) while(info) { if (info->display == display) { /* Found it */ - pipe_mutex_unlock(init_mutex); + mtx_unlock(&init_mutex); return &info->mesaDisplay; } info = info->next; @@ -216,7 +216,7 @@ xmesa_init_display( Display *display ) /* allocate mesa display info */ info = (XMesaExtDisplayInfo *) Xmalloc(sizeof(XMesaExtDisplayInfo)); if (info == NULL) { - pipe_mutex_unlock(init_mutex); + mtx_unlock(&init_mutex); return NULL; } info->display = display; @@ -255,7 +255,7 @@ xmesa_init_display( Display *display ) xmdpy->display = NULL; } - pipe_mutex_unlock(init_mutex); + mtx_unlock(&init_mutex); return xmdpy; } @@ -374,7 +374,7 @@ xmesa_get_window_size(Display *dpy, XMesaBuffer b, mtx_lock(&xmdpy->mutex); stat = get_drawable_size(dpy, b->ws.drawable, width, height); - pipe_mutex_unlock(xmdpy->mutex); + mtx_unlock(&xmdpy->mutex); if (!stat) { /* probably querying a window that's recently been destroyed */ diff --git a/src/gallium/state_trackers/nine/nine_lock.c b/src/gallium/state_trackers/nine/nine_lock.c index 0ac0cd778af..ca0f04a69b3 100644 --- a/src/gallium/state_trackers/nine/nine_lock.c +++ b/src/gallium/state_trackers/nine/nine_lock.c @@ -59,7 +59,7 @@ NineLockGlobalMutex() void NineUnlockGlobalMutex() { - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); } static HRESULT NINE_WINAPI @@ -69,7 +69,7 @@ LockAuthenticatedChannel9_GetCertificateSize( struct NineAuthenticatedChannel9 * HRESULT r; mtx_lock(&d3dlock_global); r = NineAuthenticatedChannel9_GetCertificateSize(This, pCertificateSize); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -81,7 +81,7 @@ LockAuthenticatedChannel9_GetCertificate( struct NineAuthenticatedChannel9 *This HRESULT r; mtx_lock(&d3dlock_global); r = NineAuthenticatedChannel9_GetCertificate(This, CertifacteSize, ppCertificate); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -93,7 +93,7 @@ LockAuthenticatedChannel9_NegotiateKeyExchange( struct NineAuthenticatedChannel9 HRESULT r; mtx_lock(&d3dlock_global); r = NineAuthenticatedChannel9_NegotiateKeyExchange(This, DataSize, pData); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -107,7 +107,7 @@ LockAuthenticatedChannel9_Query( struct NineAuthenticatedChannel9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineAuthenticatedChannel9_Query(This, InputSize, pInput, OutputSize, pOutput); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -120,7 +120,7 @@ LockAuthenticatedChannel9_Configure( struct NineAuthenticatedChannel9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineAuthenticatedChannel9_Configure(This, InputSize, pInput, pOutput); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -145,7 +145,7 @@ LockUnknown_SetPrivateData( struct NineUnknown *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineUnknown_SetPrivateData(This, refguid, pData, SizeOfData, Flags); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -158,7 +158,7 @@ LockUnknown_GetPrivateData( struct NineUnknown *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineUnknown_GetPrivateData(This, refguid, pData, pSizeOfData); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -169,7 +169,7 @@ LockUnknown_FreePrivateData( struct NineUnknown *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineUnknown_FreePrivateData(This, refguid); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -181,7 +181,7 @@ LockResource9_GetDevice( struct NineResource9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineUnknown_GetDevice(NineUnknown(This), ppDevice); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } #endif @@ -193,7 +193,7 @@ LockResource9_SetPriority( struct NineResource9 *This, DWORD r; mtx_lock(&d3dlock_global); r = NineResource9_SetPriority(This, PriorityNew); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -203,7 +203,7 @@ LockResource9_GetPriority( struct NineResource9 *This ) DWORD r; mtx_lock(&d3dlock_global); r = NineResource9_GetPriority(This); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -213,7 +213,7 @@ LockResource9_PreLoad( struct NineResource9 *This ) { mtx_lock(&d3dlock_global); NineResource9_PreLoad(This); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); } #endif @@ -224,7 +224,7 @@ LockResource9_GetType( struct NineResource9 *This ) D3DRESOURCETYPE r; mtx_lock(&d3dlock_global); r = NineResource9_GetType(This); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } #endif @@ -236,7 +236,7 @@ LockBaseTexture9_SetLOD( struct NineBaseTexture9 *This, DWORD r; mtx_lock(&d3dlock_global); r = NineBaseTexture9_SetLOD(This, LODNew); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -246,7 +246,7 @@ LockBaseTexture9_GetLOD( struct NineBaseTexture9 *This ) DWORD r; mtx_lock(&d3dlock_global); r = NineBaseTexture9_GetLOD(This); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -256,7 +256,7 @@ LockBaseTexture9_GetLevelCount( struct NineBaseTexture9 *This ) DWORD r; mtx_lock(&d3dlock_global); r = NineBaseTexture9_GetLevelCount(This); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -267,7 +267,7 @@ LockBaseTexture9_SetAutoGenFilterType( struct NineBaseTexture9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineBaseTexture9_SetAutoGenFilterType(This, FilterType); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -277,7 +277,7 @@ LockBaseTexture9_GetAutoGenFilterType( struct NineBaseTexture9 *This ) D3DTEXTUREFILTERTYPE r; mtx_lock(&d3dlock_global); r = NineBaseTexture9_GetAutoGenFilterType(This); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -286,7 +286,7 @@ LockBaseTexture9_PreLoad( struct NineBaseTexture9 *This ) { mtx_lock(&d3dlock_global); NineBaseTexture9_PreLoad(This); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); } static void NINE_WINAPI @@ -294,7 +294,7 @@ LockBaseTexture9_GenerateMipSubLevels( struct NineBaseTexture9 *This ) { mtx_lock(&d3dlock_global); NineBaseTexture9_GenerateMipSubLevels(This); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); } static HRESULT NINE_WINAPI @@ -304,7 +304,7 @@ LockCryptoSession9_GetCertificateSize( struct NineCryptoSession9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineCryptoSession9_GetCertificateSize(This, pCertificateSize); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -316,7 +316,7 @@ LockCryptoSession9_GetCertificate( struct NineCryptoSession9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineCryptoSession9_GetCertificate(This, CertifacteSize, ppCertificate); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -328,7 +328,7 @@ LockCryptoSession9_NegotiateKeyExchange( struct NineCryptoSession9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineCryptoSession9_NegotiateKeyExchange(This, DataSize, pData); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -342,7 +342,7 @@ LockCryptoSession9_EncryptionBlt( struct NineCryptoSession9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineCryptoSession9_EncryptionBlt(This, pSrcSurface, pDstSurface, DstSurfaceSize, pIV); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -358,7 +358,7 @@ LockCryptoSession9_DecryptionBlt( struct NineCryptoSession9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineCryptoSession9_DecryptionBlt(This, pSrcSurface, pDstSurface, SrcSurfaceSize, pEncryptedBlockInfo, pContentKey, pIV); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -370,7 +370,7 @@ LockCryptoSession9_GetSurfacePitch( struct NineCryptoSession9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineCryptoSession9_GetSurfacePitch(This, pSrcSurface, pSurfacePitch); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -382,7 +382,7 @@ LockCryptoSession9_StartSessionKeyRefresh( struct NineCryptoSession9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineCryptoSession9_StartSessionKeyRefresh(This, pRandomNumber, RandomNumberSize); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -392,7 +392,7 @@ LockCryptoSession9_FinishSessionKeyRefresh( struct NineCryptoSession9 *This ) HRESULT r; mtx_lock(&d3dlock_global); r = NineCryptoSession9_FinishSessionKeyRefresh(This); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -404,7 +404,7 @@ LockCryptoSession9_GetEncryptionBltKey( struct NineCryptoSession9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineCryptoSession9_GetEncryptionBltKey(This, pReadbackKey, KeySize); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -432,7 +432,7 @@ LockCubeTexture9_GetLevelDesc( struct NineCubeTexture9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineCubeTexture9_GetLevelDesc(This, Level, pDesc); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } #endif @@ -447,7 +447,7 @@ LockCubeTexture9_GetCubeMapSurface( struct NineCubeTexture9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineCubeTexture9_GetCubeMapSurface(This, FaceType, Level, ppCubeMapSurface); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } #endif @@ -463,7 +463,7 @@ LockCubeTexture9_LockRect( struct NineCubeTexture9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineCubeTexture9_LockRect(This, FaceType, Level, pLockedRect, pRect, Flags); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -475,7 +475,7 @@ LockCubeTexture9_UnlockRect( struct NineCubeTexture9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineCubeTexture9_UnlockRect(This, FaceType, Level); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -487,7 +487,7 @@ LockCubeTexture9_AddDirtyRect( struct NineCubeTexture9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineCubeTexture9_AddDirtyRect(This, FaceType, pDirtyRect); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -522,7 +522,7 @@ LockDevice9_TestCooperativeLevel( struct NineDevice9 *This ) HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_TestCooperativeLevel(This); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -532,7 +532,7 @@ LockDevice9_GetAvailableTextureMem( struct NineDevice9 *This ) UINT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetAvailableTextureMem(This); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -542,7 +542,7 @@ LockDevice9_EvictManagedResources( struct NineDevice9 *This ) HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_EvictManagedResources(This); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -553,7 +553,7 @@ LockDevice9_GetDirect3D( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetDirect3D(This, ppD3D9); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -565,7 +565,7 @@ LockDevice9_GetDeviceCaps( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetDeviceCaps(This, pCaps); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } #endif @@ -578,7 +578,7 @@ LockDevice9_GetDisplayMode( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetDisplayMode(This, iSwapChain, pMode); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -590,7 +590,7 @@ LockDevice9_GetCreationParameters( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetCreationParameters(This, pParameters); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } #endif @@ -604,7 +604,7 @@ LockDevice9_SetCursorProperties( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetCursorProperties(This, XHotSpot, YHotSpot, pCursorBitmap); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -616,7 +616,7 @@ LockDevice9_SetCursorPosition( struct NineDevice9 *This, { mtx_lock(&d3dlock_global); NineDevice9_SetCursorPosition(This, X, Y, Flags); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); } static BOOL NINE_WINAPI @@ -626,7 +626,7 @@ LockDevice9_ShowCursor( struct NineDevice9 *This, BOOL r; mtx_lock(&d3dlock_global); r = NineDevice9_ShowCursor(This, bShow); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -638,7 +638,7 @@ LockDevice9_CreateAdditionalSwapChain( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_CreateAdditionalSwapChain(This, pPresentationParameters, pSwapChain); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -650,7 +650,7 @@ LockDevice9_GetSwapChain( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetSwapChain(This, iSwapChain, pSwapChain); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -660,7 +660,7 @@ LockDevice9_GetNumberOfSwapChains( struct NineDevice9 *This ) UINT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetNumberOfSwapChains(This); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -671,7 +671,7 @@ LockDevice9_Reset( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_Reset(This, pPresentationParameters); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -685,7 +685,7 @@ LockDevice9_Present( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_Present(This, pSourceRect, pDestRect, hDestWindowOverride, pDirtyRegion); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -699,7 +699,7 @@ LockDevice9_GetBackBuffer( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetBackBuffer(This, iSwapChain, iBackBuffer, Type, ppBackBuffer); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -711,7 +711,7 @@ LockDevice9_GetRasterStatus( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetRasterStatus(This, iSwapChain, pRasterStatus); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -722,7 +722,7 @@ LockDevice9_SetDialogBoxMode( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetDialogBoxMode(This, bEnableDialogs); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -734,7 +734,7 @@ LockDevice9_SetGammaRamp( struct NineDevice9 *This, { mtx_lock(&d3dlock_global); NineDevice9_SetGammaRamp(This, iSwapChain, Flags, pRamp); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); } static void NINE_WINAPI @@ -744,7 +744,7 @@ LockDevice9_GetGammaRamp( struct NineDevice9 *This, { mtx_lock(&d3dlock_global); NineDevice9_GetGammaRamp(This, iSwapChain, pRamp); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); } static HRESULT NINE_WINAPI @@ -761,7 +761,7 @@ LockDevice9_CreateTexture( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_CreateTexture(This, Width, Height, Levels, Usage, Format, Pool, ppTexture, pSharedHandle); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -780,7 +780,7 @@ LockDevice9_CreateVolumeTexture( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_CreateVolumeTexture(This, Width, Height, Depth, Levels, Usage, Format, Pool, ppVolumeTexture, pSharedHandle); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -797,7 +797,7 @@ LockDevice9_CreateCubeTexture( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_CreateCubeTexture(This, EdgeLength, Levels, Usage, Format, Pool, ppCubeTexture, pSharedHandle); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -813,7 +813,7 @@ LockDevice9_CreateVertexBuffer( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_CreateVertexBuffer(This, Length, Usage, FVF, Pool, ppVertexBuffer, pSharedHandle); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -829,7 +829,7 @@ LockDevice9_CreateIndexBuffer( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_CreateIndexBuffer(This, Length, Usage, Format, Pool, ppIndexBuffer, pSharedHandle); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -847,7 +847,7 @@ LockDevice9_CreateRenderTarget( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_CreateRenderTarget(This, Width, Height, Format, MultiSample, MultisampleQuality, Lockable, ppSurface, pSharedHandle); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -865,7 +865,7 @@ LockDevice9_CreateDepthStencilSurface( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_CreateDepthStencilSurface(This, Width, Height, Format, MultiSample, MultisampleQuality, Discard, ppSurface, pSharedHandle); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -879,7 +879,7 @@ LockDevice9_UpdateSurface( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_UpdateSurface(This, pSourceSurface, pSourceRect, pDestinationSurface, pDestPoint); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -891,7 +891,7 @@ LockDevice9_UpdateTexture( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_UpdateTexture(This, pSourceTexture, pDestinationTexture); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -903,7 +903,7 @@ LockDevice9_GetRenderTargetData( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetRenderTargetData(This, pRenderTarget, pDestSurface); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -915,7 +915,7 @@ LockDevice9_GetFrontBufferData( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetFrontBufferData(This, iSwapChain, pDestSurface); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -930,7 +930,7 @@ LockDevice9_StretchRect( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_StretchRect(This, pSourceSurface, pSourceRect, pDestSurface, pDestRect, Filter); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -943,7 +943,7 @@ LockDevice9_ColorFill( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_ColorFill(This, pSurface, pRect, color); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -959,7 +959,7 @@ LockDevice9_CreateOffscreenPlainSurface( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_CreateOffscreenPlainSurface(This, Width, Height, Format, Pool, ppSurface, pSharedHandle); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -971,7 +971,7 @@ LockDevice9_SetRenderTarget( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetRenderTarget(This, RenderTargetIndex, pRenderTarget); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -983,7 +983,7 @@ LockDevice9_GetRenderTarget( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetRenderTarget(This, RenderTargetIndex, ppRenderTarget); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -994,7 +994,7 @@ LockDevice9_SetDepthStencilSurface( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetDepthStencilSurface(This, pNewZStencil); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1005,7 +1005,7 @@ LockDevice9_GetDepthStencilSurface( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetDepthStencilSurface(This, ppZStencilSurface); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1015,7 +1015,7 @@ LockDevice9_BeginScene( struct NineDevice9 *This ) HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_BeginScene(This); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1025,7 +1025,7 @@ LockDevice9_EndScene( struct NineDevice9 *This ) HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_EndScene(This); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1041,7 +1041,7 @@ LockDevice9_Clear( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_Clear(This, Count, pRects, Flags, Color, Z, Stencil); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1053,7 +1053,7 @@ LockDevice9_SetTransform( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetTransform(This, State, pMatrix); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1065,7 +1065,7 @@ LockDevice9_GetTransform( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetTransform(This, State, pMatrix); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1077,7 +1077,7 @@ LockDevice9_MultiplyTransform( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_MultiplyTransform(This, State, pMatrix); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1088,7 +1088,7 @@ LockDevice9_SetViewport( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetViewport(This, pViewport); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1099,7 +1099,7 @@ LockDevice9_GetViewport( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetViewport(This, pViewport); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1110,7 +1110,7 @@ LockDevice9_SetMaterial( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetMaterial(This, pMaterial); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1121,7 +1121,7 @@ LockDevice9_GetMaterial( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetMaterial(This, pMaterial); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1133,7 +1133,7 @@ LockDevice9_SetLight( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetLight(This, Index, pLight); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1145,7 +1145,7 @@ LockDevice9_GetLight( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetLight(This, Index, pLight); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1157,7 +1157,7 @@ LockDevice9_LightEnable( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_LightEnable(This, Index, Enable); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1169,7 +1169,7 @@ LockDevice9_GetLightEnable( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetLightEnable(This, Index, pEnable); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1181,7 +1181,7 @@ LockDevice9_SetClipPlane( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetClipPlane(This, Index, pPlane); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1193,7 +1193,7 @@ LockDevice9_GetClipPlane( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetClipPlane(This, Index, pPlane); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1205,7 +1205,7 @@ LockDevice9_SetRenderState( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetRenderState(This, State, Value); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1217,7 +1217,7 @@ LockDevice9_GetRenderState( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetRenderState(This, State, pValue); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1229,7 +1229,7 @@ LockDevice9_CreateStateBlock( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_CreateStateBlock(This, Type, ppSB); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1239,7 +1239,7 @@ LockDevice9_BeginStateBlock( struct NineDevice9 *This ) HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_BeginStateBlock(This); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1250,7 +1250,7 @@ LockDevice9_EndStateBlock( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_EndStateBlock(This, ppSB); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1261,7 +1261,7 @@ LockDevice9_SetClipStatus( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetClipStatus(This, pClipStatus); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1272,7 +1272,7 @@ LockDevice9_GetClipStatus( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetClipStatus(This, pClipStatus); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1284,7 +1284,7 @@ LockDevice9_GetTexture( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetTexture(This, Stage, ppTexture); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1296,7 +1296,7 @@ LockDevice9_SetTexture( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetTexture(This, Stage, pTexture); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1309,7 +1309,7 @@ LockDevice9_GetTextureStageState( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetTextureStageState(This, Stage, Type, pValue); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1322,7 +1322,7 @@ LockDevice9_SetTextureStageState( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetTextureStageState(This, Stage, Type, Value); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1335,7 +1335,7 @@ LockDevice9_GetSamplerState( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetSamplerState(This, Sampler, Type, pValue); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1348,7 +1348,7 @@ LockDevice9_SetSamplerState( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetSamplerState(This, Sampler, Type, Value); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1359,7 +1359,7 @@ LockDevice9_ValidateDevice( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_ValidateDevice(This, pNumPasses); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1371,7 +1371,7 @@ LockDevice9_SetPaletteEntries( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetPaletteEntries(This, PaletteNumber, pEntries); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1383,7 +1383,7 @@ LockDevice9_GetPaletteEntries( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetPaletteEntries(This, PaletteNumber, pEntries); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1394,7 +1394,7 @@ LockDevice9_SetCurrentTexturePalette( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetCurrentTexturePalette(This, PaletteNumber); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1405,7 +1405,7 @@ LockDevice9_GetCurrentTexturePalette( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetCurrentTexturePalette(This, PaletteNumber); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1416,7 +1416,7 @@ LockDevice9_SetScissorRect( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetScissorRect(This, pRect); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1427,7 +1427,7 @@ LockDevice9_GetScissorRect( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetScissorRect(This, pRect); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1438,7 +1438,7 @@ LockDevice9_SetSoftwareVertexProcessing( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetSoftwareVertexProcessing(This, bSoftware); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1448,7 +1448,7 @@ LockDevice9_GetSoftwareVertexProcessing( struct NineDevice9 *This ) BOOL r; mtx_lock(&d3dlock_global); r = NineDevice9_GetSoftwareVertexProcessing(This); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1459,7 +1459,7 @@ LockDevice9_SetNPatchMode( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetNPatchMode(This, nSegments); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1469,7 +1469,7 @@ LockDevice9_GetNPatchMode( struct NineDevice9 *This ) float r; mtx_lock(&d3dlock_global); r = NineDevice9_GetNPatchMode(This); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1482,7 +1482,7 @@ LockDevice9_DrawPrimitive( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_DrawPrimitive(This, PrimitiveType, StartVertex, PrimitiveCount); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1498,7 +1498,7 @@ LockDevice9_DrawIndexedPrimitive( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_DrawIndexedPrimitive(This, PrimitiveType, BaseVertexIndex, MinVertexIndex, NumVertices, startIndex, primCount); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1512,7 +1512,7 @@ LockDevice9_DrawPrimitiveUP( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_DrawPrimitiveUP(This, PrimitiveType, PrimitiveCount, pVertexStreamZeroData, VertexStreamZeroStride); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1530,7 +1530,7 @@ LockDevice9_DrawIndexedPrimitiveUP( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_DrawIndexedPrimitiveUP(This, PrimitiveType, MinVertexIndex, NumVertices, PrimitiveCount, pIndexData, IndexDataFormat, pVertexStreamZeroData, VertexStreamZeroStride); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1546,7 +1546,7 @@ LockDevice9_ProcessVertices( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_ProcessVertices(This, SrcStartIndex, DestIndex, VertexCount, pDestBuffer, pVertexDecl, Flags); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1558,7 +1558,7 @@ LockDevice9_CreateVertexDeclaration( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_CreateVertexDeclaration(This, pVertexElements, ppDecl); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1569,7 +1569,7 @@ LockDevice9_SetVertexDeclaration( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetVertexDeclaration(This, pDecl); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1580,7 +1580,7 @@ LockDevice9_GetVertexDeclaration( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetVertexDeclaration(This, ppDecl); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1591,7 +1591,7 @@ LockDevice9_SetFVF( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetFVF(This, FVF); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1602,7 +1602,7 @@ LockDevice9_GetFVF( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetFVF(This, pFVF); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1614,7 +1614,7 @@ LockDevice9_CreateVertexShader( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_CreateVertexShader(This, pFunction, ppShader); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1625,7 +1625,7 @@ LockDevice9_SetVertexShader( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetVertexShader(This, pShader); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1636,7 +1636,7 @@ LockDevice9_GetVertexShader( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetVertexShader(This, ppShader); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1649,7 +1649,7 @@ LockDevice9_SetVertexShaderConstantF( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetVertexShaderConstantF(This, StartRegister, pConstantData, Vector4fCount); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1662,7 +1662,7 @@ LockDevice9_GetVertexShaderConstantF( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetVertexShaderConstantF(This, StartRegister, pConstantData, Vector4fCount); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1675,7 +1675,7 @@ LockDevice9_SetVertexShaderConstantI( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetVertexShaderConstantI(This, StartRegister, pConstantData, Vector4iCount); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1688,7 +1688,7 @@ LockDevice9_GetVertexShaderConstantI( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetVertexShaderConstantI(This, StartRegister, pConstantData, Vector4iCount); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1701,7 +1701,7 @@ LockDevice9_SetVertexShaderConstantB( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetVertexShaderConstantB(This, StartRegister, pConstantData, BoolCount); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1714,7 +1714,7 @@ LockDevice9_GetVertexShaderConstantB( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetVertexShaderConstantB(This, StartRegister, pConstantData, BoolCount); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1728,7 +1728,7 @@ LockDevice9_SetStreamSource( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetStreamSource(This, StreamNumber, pStreamData, OffsetInBytes, Stride); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1742,7 +1742,7 @@ LockDevice9_GetStreamSource( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetStreamSource(This, StreamNumber, ppStreamData, pOffsetInBytes, pStride); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1754,7 +1754,7 @@ LockDevice9_SetStreamSourceFreq( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetStreamSourceFreq(This, StreamNumber, Setting); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1766,7 +1766,7 @@ LockDevice9_GetStreamSourceFreq( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetStreamSourceFreq(This, StreamNumber, pSetting); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1777,7 +1777,7 @@ LockDevice9_SetIndices( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetIndices(This, pIndexData); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1788,7 +1788,7 @@ LockDevice9_GetIndices( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetIndices(This, ppIndexData); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1800,7 +1800,7 @@ LockDevice9_CreatePixelShader( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_CreatePixelShader(This, pFunction, ppShader); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1811,7 +1811,7 @@ LockDevice9_SetPixelShader( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetPixelShader(This, pShader); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1822,7 +1822,7 @@ LockDevice9_GetPixelShader( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetPixelShader(This, ppShader); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1835,7 +1835,7 @@ LockDevice9_SetPixelShaderConstantF( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetPixelShaderConstantF(This, StartRegister, pConstantData, Vector4fCount); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1848,7 +1848,7 @@ LockDevice9_GetPixelShaderConstantF( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetPixelShaderConstantF(This, StartRegister, pConstantData, Vector4fCount); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1861,7 +1861,7 @@ LockDevice9_SetPixelShaderConstantI( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetPixelShaderConstantI(This, StartRegister, pConstantData, Vector4iCount); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1874,7 +1874,7 @@ LockDevice9_GetPixelShaderConstantI( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetPixelShaderConstantI(This, StartRegister, pConstantData, Vector4iCount); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1887,7 +1887,7 @@ LockDevice9_SetPixelShaderConstantB( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_SetPixelShaderConstantB(This, StartRegister, pConstantData, BoolCount); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1900,7 +1900,7 @@ LockDevice9_GetPixelShaderConstantB( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_GetPixelShaderConstantB(This, StartRegister, pConstantData, BoolCount); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1913,7 +1913,7 @@ LockDevice9_DrawRectPatch( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_DrawRectPatch(This, Handle, pNumSegs, pRectPatchInfo); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1926,7 +1926,7 @@ LockDevice9_DrawTriPatch( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_DrawTriPatch(This, Handle, pNumSegs, pTriPatchInfo); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1937,7 +1937,7 @@ LockDevice9_DeletePatch( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_DeletePatch(This, Handle); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -1949,7 +1949,7 @@ LockDevice9_CreateQuery( struct NineDevice9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9_CreateQuery(This, Type, ppQuery); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2085,7 +2085,7 @@ LockDevice9Ex_SetConvolutionMonoKernel( struct NineDevice9Ex *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9Ex_SetConvolutionMonoKernel(This, width, height, rows, columns); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2103,7 +2103,7 @@ LockDevice9Ex_ComposeRects( struct NineDevice9Ex *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9Ex_ComposeRects(This, pSrc, pDst, pSrcRectDescs, NumRects, pDstRectDescs, Operation, Xoffset, Yoffset); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2118,7 +2118,7 @@ LockDevice9Ex_PresentEx( struct NineDevice9Ex *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9Ex_PresentEx(This, pSourceRect, pDestRect, hDestWindowOverride, pDirtyRegion, dwFlags); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2129,7 +2129,7 @@ LockDevice9Ex_GetGPUThreadPriority( struct NineDevice9Ex *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9Ex_GetGPUThreadPriority(This, pPriority); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2140,7 +2140,7 @@ LockDevice9Ex_SetGPUThreadPriority( struct NineDevice9Ex *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9Ex_SetGPUThreadPriority(This, Priority); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2151,7 +2151,7 @@ LockDevice9Ex_WaitForVBlank( struct NineDevice9Ex *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9Ex_WaitForVBlank(This, iSwapChain); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2163,7 +2163,7 @@ LockDevice9Ex_CheckResourceResidency( struct NineDevice9Ex *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9Ex_CheckResourceResidency(This, pResourceArray, NumResources); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2174,7 +2174,7 @@ LockDevice9Ex_SetMaximumFrameLatency( struct NineDevice9Ex *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9Ex_SetMaximumFrameLatency(This, MaxLatency); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2185,7 +2185,7 @@ LockDevice9Ex_GetMaximumFrameLatency( struct NineDevice9Ex *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9Ex_GetMaximumFrameLatency(This, pMaxLatency); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2196,7 +2196,7 @@ LockDevice9Ex_CheckDeviceState( struct NineDevice9Ex *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9Ex_CheckDeviceState(This, hDestinationWindow); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2215,7 +2215,7 @@ LockDevice9Ex_CreateRenderTargetEx( struct NineDevice9Ex *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9Ex_CreateRenderTargetEx(This, Width, Height, Format, MultiSample, MultisampleQuality, Lockable, ppSurface, pSharedHandle, Usage); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2232,7 +2232,7 @@ LockDevice9Ex_CreateOffscreenPlainSurfaceEx( struct NineDevice9Ex *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9Ex_CreateOffscreenPlainSurfaceEx(This, Width, Height, Format, Pool, ppSurface, pSharedHandle, Usage); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2251,7 +2251,7 @@ LockDevice9Ex_CreateDepthStencilSurfaceEx( struct NineDevice9Ex *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9Ex_CreateDepthStencilSurfaceEx(This, Width, Height, Format, MultiSample, MultisampleQuality, Discard, ppSurface, pSharedHandle, Usage); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2263,7 +2263,7 @@ LockDevice9Ex_ResetEx( struct NineDevice9Ex *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9Ex_ResetEx(This, pPresentationParameters, pFullscreenDisplayMode); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2276,7 +2276,7 @@ LockDevice9Ex_GetDisplayModeEx( struct NineDevice9Ex *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9Ex_GetDisplayModeEx(This, iSwapChain, pMode, pRotation); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2426,7 +2426,7 @@ LockDevice9Video_GetContentProtectionCaps( struct NineDevice9Video *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9Video_GetContentProtectionCaps(This, pCryptoType, pDecodeProfile, pCaps); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2439,7 +2439,7 @@ LockDevice9Video_CreateAuthenticatedChannel( struct NineDevice9Video *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9Video_CreateAuthenticatedChannel(This, ChannelType, ppAuthenticatedChannel, pChannelHandle); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2453,7 +2453,7 @@ LockDevice9Video_CreateCryptoSession( struct NineDevice9Video *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineDevice9Video_CreateCryptoSession(This, pCryptoType, pDecodeProfile, ppCryptoSession, pCryptoHandle); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2476,7 +2476,7 @@ LockIndexBuffer9_Lock( struct NineIndexBuffer9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineIndexBuffer9_Lock(This, OffsetToLock, SizeToLock, ppbData, Flags); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2486,7 +2486,7 @@ LockIndexBuffer9_Unlock( struct NineIndexBuffer9 *This ) HRESULT r; mtx_lock(&d3dlock_global); r = NineIndexBuffer9_Unlock(This); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2498,7 +2498,7 @@ LockIndexBuffer9_GetDesc( struct NineIndexBuffer9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineIndexBuffer9_GetDesc(This, pDesc); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } #endif @@ -2528,7 +2528,7 @@ LockPixelShader9_GetDevice( struct NinePixelShader9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineUnknown_GetDevice(NineUnknown(This), ppDevice); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } #endif @@ -2541,7 +2541,7 @@ LockPixelShader9_GetFunction( struct NinePixelShader9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NinePixelShader9_GetFunction(This, pData, pSizeOfData); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2561,7 +2561,7 @@ LockQuery9_GetDevice( struct NineQuery9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineUnknown_GetDevice(NineUnknown(This), ppDevice); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } #endif @@ -2573,7 +2573,7 @@ LockQuery9_GetType( struct NineQuery9 *This ) D3DQUERYTYPE r; mtx_lock(&d3dlock_global); r = NineQuery9_GetType(This); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } #endif @@ -2585,7 +2585,7 @@ LockQuery9_GetDataSize( struct NineQuery9 *This ) DWORD r; mtx_lock(&d3dlock_global); r = NineQuery9_GetDataSize(This); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } #endif @@ -2597,7 +2597,7 @@ LockQuery9_Issue( struct NineQuery9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineQuery9_Issue(This, dwIssueFlags); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2610,7 +2610,7 @@ LockQuery9_GetData( struct NineQuery9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineQuery9_GetData(This, pData, dwSize, dwGetDataFlags); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2633,7 +2633,7 @@ LockStateBlock9_GetDevice( struct NineStateBlock9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineUnknown_GetDevice(NineUnknown(This), ppDevice); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } #endif @@ -2644,7 +2644,7 @@ LockStateBlock9_Capture( struct NineStateBlock9 *This ) HRESULT r; mtx_lock(&d3dlock_global); r = NineStateBlock9_Capture(This); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2654,7 +2654,7 @@ LockStateBlock9_Apply( struct NineStateBlock9 *This ) HRESULT r; mtx_lock(&d3dlock_global); r = NineStateBlock9_Apply(This); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2675,7 +2675,7 @@ LockSurface9_GetContainer( struct NineSurface9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineSurface9_GetContainer(This, riid, ppContainer); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2687,7 +2687,7 @@ LockSurface9_GetDesc( struct NineSurface9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineSurface9_GetDesc(This, pDesc); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } #endif @@ -2701,7 +2701,7 @@ LockSurface9_LockRect( struct NineSurface9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineSurface9_LockRect(This, pLockedRect, pRect, Flags); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2711,7 +2711,7 @@ LockSurface9_UnlockRect( struct NineSurface9 *This ) HRESULT r; mtx_lock(&d3dlock_global); r = NineSurface9_UnlockRect(This); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2722,7 +2722,7 @@ LockSurface9_GetDC( struct NineSurface9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineSurface9_GetDC(This, phdc); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2733,7 +2733,7 @@ LockSurface9_ReleaseDC( struct NineSurface9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineSurface9_ReleaseDC(This, hdc); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2768,7 +2768,7 @@ LockSwapChain9_Present( struct NineSwapChain9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineSwapChain9_Present(This, pSourceRect, pDestRect, hDestWindowOverride, pDirtyRegion, dwFlags); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2779,7 +2779,7 @@ LockSwapChain9_GetFrontBufferData( struct NineSwapChain9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineSwapChain9_GetFrontBufferData(This, pDestSurface); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2792,7 +2792,7 @@ LockSwapChain9_GetBackBuffer( struct NineSwapChain9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineSwapChain9_GetBackBuffer(This, iBackBuffer, Type, ppBackBuffer); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2803,7 +2803,7 @@ LockSwapChain9_GetRasterStatus( struct NineSwapChain9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineSwapChain9_GetRasterStatus(This, pRasterStatus); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2814,7 +2814,7 @@ LockSwapChain9_GetDisplayMode( struct NineSwapChain9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineSwapChain9_GetDisplayMode(This, pMode); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2826,7 +2826,7 @@ LockSwapChain9_GetDevice( struct NineSwapChain9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineUnknown_GetDevice(NineUnknown(This), ppDevice); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } #endif @@ -2838,7 +2838,7 @@ LockSwapChain9_GetPresentParameters( struct NineSwapChain9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineSwapChain9_GetPresentParameters(This, pPresentationParameters); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2862,7 +2862,7 @@ LockSwapChain9Ex_GetLastPresentCount( struct NineSwapChain9Ex *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineSwapChain9Ex_GetLastPresentCount(This, pLastPresentCount); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2873,7 +2873,7 @@ LockSwapChain9Ex_GetPresentStats( struct NineSwapChain9Ex *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineSwapChain9Ex_GetPresentStats(This, pPresentationStatistics); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2885,7 +2885,7 @@ LockSwapChain9Ex_GetDisplayModeEx( struct NineSwapChain9Ex *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineSwapChain9Ex_GetDisplayModeEx(This, pMode, pRotation); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2914,7 +2914,7 @@ LockTexture9_GetLevelDesc( struct NineTexture9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineTexture9_GetLevelDesc(This, Level, pDesc); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } #endif @@ -2928,7 +2928,7 @@ LockTexture9_GetSurfaceLevel( struct NineTexture9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineTexture9_GetSurfaceLevel(This, Level, ppSurfaceLevel); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } #endif @@ -2943,7 +2943,7 @@ LockTexture9_LockRect( struct NineTexture9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineTexture9_LockRect(This, Level, pLockedRect, pRect, Flags); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2954,7 +2954,7 @@ LockTexture9_UnlockRect( struct NineTexture9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineTexture9_UnlockRect(This, Level); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -2965,7 +2965,7 @@ LockTexture9_AddDirtyRect( struct NineTexture9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineTexture9_AddDirtyRect(This, pDirtyRect); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -3004,7 +3004,7 @@ LockVertexBuffer9_Lock( struct NineVertexBuffer9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineVertexBuffer9_Lock(This, OffsetToLock, SizeToLock, ppbData, Flags); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -3014,7 +3014,7 @@ LockVertexBuffer9_Unlock( struct NineVertexBuffer9 *This ) HRESULT r; mtx_lock(&d3dlock_global); r = NineVertexBuffer9_Unlock(This); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -3026,7 +3026,7 @@ LockVertexBuffer9_GetDesc( struct NineVertexBuffer9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineVertexBuffer9_GetDesc(This, pDesc); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } #endif @@ -3056,7 +3056,7 @@ LockVertexDeclaration9_GetDevice( struct NineVertexDeclaration9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineUnknown_GetDevice(NineUnknown(This), ppDevice); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } #endif @@ -3069,7 +3069,7 @@ LockVertexDeclaration9_GetDeclaration( struct NineVertexDeclaration9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineVertexDeclaration9_GetDeclaration(This, pElement, pNumElements); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -3089,7 +3089,7 @@ LockVertexShader9_GetDevice( struct NineVertexShader9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineUnknown_GetDevice(NineUnknown(This), ppDevice); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } #endif @@ -3102,7 +3102,7 @@ LockVertexShader9_GetFunction( struct NineVertexShader9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineVertexShader9_GetFunction(This, pData, pSizeOfData); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -3122,7 +3122,7 @@ LockVolume9_GetDevice( struct NineVolume9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineUnknown_GetDevice(NineUnknown(This), ppDevice); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } #endif @@ -3135,7 +3135,7 @@ LockVolume9_GetContainer( struct NineVolume9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineVolume9_GetContainer(This, riid, ppContainer); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -3147,7 +3147,7 @@ LockVolume9_GetDesc( struct NineVolume9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineVolume9_GetDesc(This, pDesc); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } #endif @@ -3161,7 +3161,7 @@ LockVolume9_LockBox( struct NineVolume9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineVolume9_LockBox(This, pLockedVolume, pBox, Flags); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -3171,7 +3171,7 @@ LockVolume9_UnlockBox( struct NineVolume9 *This ) HRESULT r; mtx_lock(&d3dlock_global); r = NineVolume9_UnlockBox(This); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -3198,7 +3198,7 @@ LockVolumeTexture9_GetLevelDesc( struct NineVolumeTexture9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineVolumeTexture9_GetLevelDesc(This, Level, pDesc); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } #endif @@ -3212,7 +3212,7 @@ LockVolumeTexture9_GetVolumeLevel( struct NineVolumeTexture9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineVolumeTexture9_GetVolumeLevel(This, Level, ppVolumeLevel); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } #endif @@ -3227,7 +3227,7 @@ LockVolumeTexture9_LockBox( struct NineVolumeTexture9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineVolumeTexture9_LockBox(This, Level, pLockedVolume, pBox, Flags); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -3238,7 +3238,7 @@ LockVolumeTexture9_UnlockBox( struct NineVolumeTexture9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineVolumeTexture9_UnlockBox(This, Level); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } @@ -3249,7 +3249,7 @@ LockVolumeTexture9_AddDirtyBox( struct NineVolumeTexture9 *This, HRESULT r; mtx_lock(&d3dlock_global); r = NineVolumeTexture9_AddDirtyBox(This, pDirtyBox); - pipe_mutex_unlock(d3dlock_global); + mtx_unlock(&d3dlock_global); return r; } diff --git a/src/gallium/state_trackers/nine/nine_queue.c b/src/gallium/state_trackers/nine/nine_queue.c index 39de0ca9650..2a65a1e13ba 100644 --- a/src/gallium/state_trackers/nine/nine_queue.c +++ b/src/gallium/state_trackers/nine/nine_queue.c @@ -92,7 +92,7 @@ nine_queue_wait_flush(struct nine_queue_pool* ctx) cnd_wait(&ctx->event_push, &ctx->mutex_push); } DBG("got cmdbuf=%p\n", cmdbuf); - pipe_mutex_unlock(ctx->mutex_push); + mtx_unlock(&ctx->mutex_push); cmdbuf->offset = 0; ctx->cur_instr = 0; @@ -115,7 +115,7 @@ nine_queue_get(struct nine_queue_pool* ctx) DBG("freeing cmdbuf=%p\n", cmdbuf); cmdbuf->full = 0; cnd_signal(&ctx->event_pop); - pipe_mutex_unlock(ctx->mutex_pop); + mtx_unlock(&ctx->mutex_pop); ctx->tail = (ctx->tail + 1) & NINE_CMD_BUFS_MASK; @@ -151,7 +151,7 @@ nine_queue_flush(struct nine_queue_pool* ctx) mtx_lock(&ctx->mutex_push); cmdbuf->full = 1; cnd_signal(&ctx->event_push); - pipe_mutex_unlock(ctx->mutex_push); + mtx_unlock(&ctx->mutex_push); ctx->head = (ctx->head + 1) & NINE_CMD_BUFS_MASK; @@ -165,7 +165,7 @@ nine_queue_flush(struct nine_queue_pool* ctx) cnd_wait(&ctx->event_pop, &ctx->mutex_pop); } DBG("got empty cmdbuf=%p\n", cmdbuf); - pipe_mutex_unlock(ctx->mutex_pop); + mtx_unlock(&ctx->mutex_pop); cmdbuf->offset = 0; cmdbuf->num_instr = 0; } diff --git a/src/gallium/state_trackers/nine/nine_state.c b/src/gallium/state_trackers/nine/nine_state.c index 2f654141d33..c3483e4c24f 100644 --- a/src/gallium/state_trackers/nine/nine_state.c +++ b/src/gallium/state_trackers/nine/nine_state.c @@ -83,7 +83,7 @@ nine_csmt_wait_processed(struct csmt_context *ctx) while (!p_atomic_read(&ctx->processed)) { cnd_wait(&ctx->event_processed, &ctx->mutex_processed); } - pipe_mutex_unlock(ctx->mutex_processed); + mtx_unlock(&ctx->mutex_processed); } /* CSMT worker thread */ @@ -109,23 +109,23 @@ PIPE_THREAD_ROUTINE(nine_csmt_worker, arg) mtx_lock(&ctx->mutex_processed); p_atomic_set(&ctx->processed, TRUE); cnd_signal(&ctx->event_processed); - pipe_mutex_unlock(ctx->mutex_processed); + mtx_unlock(&ctx->mutex_processed); } if (p_atomic_read(&ctx->toPause)) { - pipe_mutex_unlock(ctx->thread_running); + mtx_unlock(&ctx->thread_running); /* will wait here the thread can be resumed */ mtx_lock(&ctx->thread_resume); mtx_lock(&ctx->thread_running); - pipe_mutex_unlock(ctx->thread_resume); + mtx_unlock(&ctx->thread_resume); } } - pipe_mutex_unlock(ctx->thread_running); + mtx_unlock(&ctx->thread_running); if (p_atomic_read(&ctx->terminate)) { mtx_lock(&ctx->mutex_processed); p_atomic_set(&ctx->processed, TRUE); cnd_signal(&ctx->event_processed); - pipe_mutex_unlock(ctx->mutex_processed); + mtx_unlock(&ctx->mutex_processed); break; } } @@ -273,8 +273,8 @@ nine_csmt_resume( struct NineDevice9 *device ) return; ctx->hasPaused = FALSE; - pipe_mutex_unlock(ctx->thread_running); - pipe_mutex_unlock(ctx->thread_resume); + mtx_unlock(&ctx->thread_running); + mtx_unlock(&ctx->thread_resume); } struct pipe_context * diff --git a/src/gallium/state_trackers/omx/entrypoint.c b/src/gallium/state_trackers/omx/entrypoint.c index 0274caa165f..5afb58be3a3 100644 --- a/src/gallium/state_trackers/omx/entrypoint.c +++ b/src/gallium/state_trackers/omx/entrypoint.c @@ -107,11 +107,11 @@ struct vl_screen *omx_get_screen(void) ++omx_usecount; - pipe_mutex_unlock(omx_lock); + mtx_unlock(&omx_lock); return omx_screen; error: - pipe_mutex_unlock(omx_lock); + mtx_unlock(&omx_lock); return NULL; } @@ -127,7 +127,7 @@ void omx_put_screen(void) else XCloseDisplay(omx_display); } - pipe_mutex_unlock(omx_lock); + mtx_unlock(&omx_lock); } OMX_ERRORTYPE omx_workaround_Destructor(OMX_COMPONENTTYPE *comp) diff --git a/src/gallium/state_trackers/va/buffer.c b/src/gallium/state_trackers/va/buffer.c index b9bf6f0add1..fb5b20e44bb 100644 --- a/src/gallium/state_trackers/va/buffer.c +++ b/src/gallium/state_trackers/va/buffer.c @@ -66,7 +66,7 @@ vlVaCreateBuffer(VADriverContextP ctx, VAContextID context, VABufferType type, drv = VL_VA_DRIVER(ctx); mtx_lock(&drv->mutex); *buf_id = handle_table_add(drv->htab, buf); - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_SUCCESS; } @@ -84,7 +84,7 @@ vlVaBufferSetNumElements(VADriverContextP ctx, VABufferID buf_id, drv = VL_VA_DRIVER(ctx); mtx_lock(&drv->mutex); buf = handle_table_get(drv->htab, buf_id); - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); if (!buf) return VA_STATUS_ERROR_INVALID_BUFFER; @@ -120,7 +120,7 @@ vlVaMapBuffer(VADriverContextP ctx, VABufferID buf_id, void **pbuff) mtx_lock(&drv->mutex); buf = handle_table_get(drv->htab, buf_id); if (!buf || buf->export_refcount > 0) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_BUFFER; } @@ -128,7 +128,7 @@ vlVaMapBuffer(VADriverContextP ctx, VABufferID buf_id, void **pbuff) *pbuff = pipe_buffer_map(drv->pipe, buf->derived_surface.resource, PIPE_TRANSFER_WRITE, &buf->derived_surface.transfer); - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); if (!buf->derived_surface.transfer || !*pbuff) return VA_STATUS_ERROR_INVALID_BUFFER; @@ -140,7 +140,7 @@ vlVaMapBuffer(VADriverContextP ctx, VABufferID buf_id, void **pbuff) *pbuff = buf->data; } } else { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); *pbuff = buf->data; } @@ -163,20 +163,20 @@ vlVaUnmapBuffer(VADriverContextP ctx, VABufferID buf_id) mtx_lock(&drv->mutex); buf = handle_table_get(drv->htab, buf_id); if (!buf || buf->export_refcount > 0) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_BUFFER; } if (buf->derived_surface.resource) { if (!buf->derived_surface.transfer) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_BUFFER; } pipe_buffer_unmap(drv->pipe, buf->derived_surface.transfer); buf->derived_surface.transfer = NULL; } - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_SUCCESS; } @@ -194,7 +194,7 @@ vlVaDestroyBuffer(VADriverContextP ctx, VABufferID buf_id) mtx_lock(&drv->mutex); buf = handle_table_get(drv->htab, buf_id); if (!buf) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_BUFFER; } @@ -204,7 +204,7 @@ vlVaDestroyBuffer(VADriverContextP ctx, VABufferID buf_id) FREE(buf->data); FREE(buf); handle_table_remove(VL_VA_DRIVER(ctx)->htab, buf_id); - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_SUCCESS; } @@ -222,7 +222,7 @@ vlVaBufferInfo(VADriverContextP ctx, VABufferID buf_id, VABufferType *type, drv = VL_VA_DRIVER(ctx); mtx_lock(&drv->mutex); buf = handle_table_get(drv->htab, buf_id); - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); if (!buf) return VA_STATUS_ERROR_INVALID_BUFFER; @@ -256,7 +256,7 @@ vlVaAcquireBufferHandle(VADriverContextP ctx, VABufferID buf_id, screen = VL_VA_PSCREEN(ctx); mtx_lock(&drv->mutex); buf = handle_table_get(VL_VA_DRIVER(ctx)->htab, buf_id); - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); if (!buf) return VA_STATUS_ERROR_INVALID_BUFFER; @@ -304,11 +304,11 @@ vlVaAcquireBufferHandle(VADriverContextP ctx, VABufferID buf_id, if (!screen->resource_get_handle(screen, drv->pipe, buf->derived_surface.resource, &whandle, PIPE_HANDLE_USAGE_READ_WRITE)) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_BUFFER; } - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); buf_info->handle = (intptr_t)whandle.handle; break; @@ -341,7 +341,7 @@ vlVaReleaseBufferHandle(VADriverContextP ctx, VABufferID buf_id) drv = VL_VA_DRIVER(ctx); mtx_lock(&drv->mutex); buf = handle_table_get(drv->htab, buf_id); - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); if (!buf) return VA_STATUS_ERROR_INVALID_BUFFER; diff --git a/src/gallium/state_trackers/va/config.c b/src/gallium/state_trackers/va/config.c index 3d4e24bd814..15beb6cd00f 100644 --- a/src/gallium/state_trackers/va/config.c +++ b/src/gallium/state_trackers/va/config.c @@ -202,7 +202,7 @@ vlVaCreateConfig(VADriverContextP ctx, VAProfile profile, VAEntrypoint entrypoin mtx_lock(&drv->mutex); *config_id = handle_table_add(drv->htab, config); - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_SUCCESS; } @@ -267,7 +267,7 @@ vlVaCreateConfig(VADriverContextP ctx, VAProfile profile, VAEntrypoint entrypoin mtx_lock(&drv->mutex); *config_id = handle_table_add(drv->htab, config); - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_SUCCESS; } @@ -294,7 +294,7 @@ vlVaDestroyConfig(VADriverContextP ctx, VAConfigID config_id) FREE(config); handle_table_remove(drv->htab, config_id); - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_SUCCESS; } @@ -316,7 +316,7 @@ vlVaQueryConfigAttributes(VADriverContextP ctx, VAConfigID config_id, VAProfile mtx_lock(&drv->mutex); config = handle_table_get(drv->htab, config_id); - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); if (!config) return VA_STATUS_ERROR_INVALID_CONFIG; diff --git a/src/gallium/state_trackers/va/context.c b/src/gallium/state_trackers/va/context.c index a3452473484..4224ed7f048 100644 --- a/src/gallium/state_trackers/va/context.c +++ b/src/gallium/state_trackers/va/context.c @@ -216,7 +216,7 @@ vlVaCreateContext(VADriverContextP ctx, VAConfigID config_id, int picture_width, drv = VL_VA_DRIVER(ctx); mtx_lock(&drv->mutex); config = handle_table_get(drv->htab, config_id); - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); is_vpp = config->profile == PIPE_VIDEO_PROFILE_UNKNOWN && !picture_width && !picture_height && !flag && !render_targets && !num_render_targets; @@ -289,7 +289,7 @@ vlVaCreateContext(VADriverContextP ctx, VAConfigID config_id, int picture_width, mtx_lock(&drv->mutex); *context_id = handle_table_add(drv->htab, context); - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_SUCCESS; } @@ -307,7 +307,7 @@ vlVaDestroyContext(VADriverContextP ctx, VAContextID context_id) mtx_lock(&drv->mutex); context = handle_table_get(drv->htab, context_id); if (!context) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_CONTEXT; } @@ -332,7 +332,7 @@ vlVaDestroyContext(VADriverContextP ctx, VAContextID context_id) } FREE(context); handle_table_remove(drv->htab, context_id); - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_SUCCESS; } diff --git a/src/gallium/state_trackers/va/image.c b/src/gallium/state_trackers/va/image.c index 2c7afe2a443..2ce22cefe7c 100644 --- a/src/gallium/state_trackers/va/image.c +++ b/src/gallium/state_trackers/va/image.c @@ -116,7 +116,7 @@ vlVaCreateImage(VADriverContextP ctx, VAImageFormat *format, int width, int heig return VA_STATUS_ERROR_ALLOCATION_FAILED; mtx_lock(&drv->mutex); img->image_id = handle_table_add(drv->htab, img); - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); img->format = *format; img->width = width; @@ -268,7 +268,7 @@ vlVaDeriveImage(VADriverContextP ctx, VASurfaceID surface, VAImage *image) pipe_resource_reference(&img_buf->derived_surface.resource, surfaces[0]->texture); img->buf = handle_table_add(VL_VA_DRIVER(ctx)->htab, img_buf); - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); *image = *img; @@ -289,12 +289,12 @@ vlVaDestroyImage(VADriverContextP ctx, VAImageID image) mtx_lock(&drv->mutex); vaimage = handle_table_get(drv->htab, image); if (!vaimage) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_IMAGE; } handle_table_remove(VL_VA_DRIVER(ctx)->htab, image); - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); status = vlVaDestroyBuffer(ctx, vaimage->buf); FREE(vaimage); return status; @@ -331,25 +331,25 @@ vlVaGetImage(VADriverContextP ctx, VASurfaceID surface, int x, int y, mtx_lock(&drv->mutex); surf = handle_table_get(drv->htab, surface); if (!surf || !surf->buffer) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_SURFACE; } vaimage = handle_table_get(drv->htab, image); if (!vaimage) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_IMAGE; } img_buf = handle_table_get(drv->htab, vaimage->buf); if (!img_buf) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_BUFFER; } format = VaFourccToPipeFormat(vaimage->format.fourcc); if (format == PIPE_FORMAT_NONE) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_OPERATION_FAILED; } @@ -361,14 +361,14 @@ vlVaGetImage(VADriverContextP ctx, VASurfaceID surface, int x, int y, surf->buffer->buffer_format == PIPE_FORMAT_NV12)) convert = true; else { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_OPERATION_FAILED; } } views = surf->buffer->get_sampler_view_planes(surf->buffer); if (!views) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_OPERATION_FAILED; } @@ -398,7 +398,7 @@ vlVaGetImage(VADriverContextP ctx, VASurfaceID surface, int x, int y, map = drv->pipe->transfer_map(drv->pipe, views[i]->texture, 0, PIPE_TRANSFER_READ, &box, &transfer); if (!map) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_OPERATION_FAILED; } @@ -415,7 +415,7 @@ vlVaGetImage(VADriverContextP ctx, VASurfaceID surface, int x, int y, pipe_transfer_unmap(drv->pipe, transfer); } } - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_SUCCESS; } @@ -442,32 +442,32 @@ vlVaPutImage(VADriverContextP ctx, VASurfaceID surface, VAImageID image, surf = handle_table_get(drv->htab, surface); if (!surf || !surf->buffer) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_SURFACE; } vaimage = handle_table_get(drv->htab, image); if (!vaimage) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_IMAGE; } img_buf = handle_table_get(drv->htab, vaimage->buf); if (!img_buf) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_BUFFER; } if (img_buf->derived_surface.resource) { /* Attempting to transfer derived image to surface */ - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_UNIMPLEMENTED; } format = VaFourccToPipeFormat(vaimage->format.fourcc); if (format == PIPE_FORMAT_NONE) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_OPERATION_FAILED; } @@ -481,7 +481,7 @@ vlVaPutImage(VADriverContextP ctx, VASurfaceID surface, VAImageID image, tmp_buf = drv->pipe->create_video_buffer(drv->pipe, &templat); if (!tmp_buf) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_ALLOCATION_FAILED; } @@ -492,7 +492,7 @@ vlVaPutImage(VADriverContextP ctx, VASurfaceID surface, VAImageID image, views = surf->buffer->get_sampler_view_planes(surf->buffer); if (!views) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_OPERATION_FAILED; } @@ -549,7 +549,7 @@ vlVaPutImage(VADriverContextP ctx, VASurfaceID surface, VAImageID image, } } } - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_SUCCESS; } diff --git a/src/gallium/state_trackers/va/picture.c b/src/gallium/state_trackers/va/picture.c index 6a1adb27378..62a68786c44 100644 --- a/src/gallium/state_trackers/va/picture.c +++ b/src/gallium/state_trackers/va/picture.c @@ -53,12 +53,12 @@ vlVaBeginPicture(VADriverContextP ctx, VAContextID context_id, VASurfaceID rende mtx_lock(&drv->mutex); context = handle_table_get(drv->htab, context_id); if (!context) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_CONTEXT; } surf = handle_table_get(drv->htab, render_target); - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); if (!surf || !surf->buffer) return VA_STATUS_ERROR_INVALID_SURFACE; @@ -497,14 +497,14 @@ vlVaRenderPicture(VADriverContextP ctx, VAContextID context_id, VABufferID *buff mtx_lock(&drv->mutex); context = handle_table_get(drv->htab, context_id); if (!context) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_CONTEXT; } for (i = 0; i < num_buffers; ++i) { vlVaBuffer *buf = handle_table_get(drv->htab, buffers[i]); if (!buf) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_BUFFER; } @@ -548,7 +548,7 @@ vlVaRenderPicture(VADriverContextP ctx, VAContextID context_id, VABufferID *buff break; } } - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return vaStatus; } @@ -571,7 +571,7 @@ vlVaEndPicture(VADriverContextP ctx, VAContextID context_id) mtx_lock(&drv->mutex); context = handle_table_get(drv->htab, context_id); - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); if (!context) return VA_STATUS_ERROR_INVALID_CONTEXT; @@ -619,6 +619,6 @@ vlVaEndPicture(VADriverContextP ctx, VAContextID context_id) surf->force_flushed = true; } } - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_SUCCESS; } diff --git a/src/gallium/state_trackers/va/subpicture.c b/src/gallium/state_trackers/va/subpicture.c index 0d907586fd3..15d52b941c3 100644 --- a/src/gallium/state_trackers/va/subpicture.c +++ b/src/gallium/state_trackers/va/subpicture.c @@ -76,19 +76,19 @@ vlVaCreateSubpicture(VADriverContextP ctx, VAImageID image, mtx_lock(&drv->mutex); img = handle_table_get(drv->htab, image); if (!img) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_IMAGE; } sub = CALLOC(1, sizeof(*sub)); if (!sub) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_ALLOCATION_FAILED; } sub->image = img; *subpicture = handle_table_add(VL_VA_DRIVER(ctx)->htab, sub); - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_SUCCESS; } @@ -107,13 +107,13 @@ vlVaDestroySubpicture(VADriverContextP ctx, VASubpictureID subpicture) sub = handle_table_get(drv->htab, subpicture); if (!sub) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_SUBPICTURE; } FREE(sub); handle_table_remove(drv->htab, subpicture); - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_SUCCESS; } @@ -133,12 +133,12 @@ vlVaSubpictureImage(VADriverContextP ctx, VASubpictureID subpicture, VAImageID i img = handle_table_get(drv->htab, image); if (!img) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_IMAGE; } sub = handle_table_get(drv->htab, subpicture); - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); if (!sub) return VA_STATUS_ERROR_INVALID_SUBPICTURE; @@ -190,14 +190,14 @@ vlVaAssociateSubpicture(VADriverContextP ctx, VASubpictureID subpicture, sub = handle_table_get(drv->htab, subpicture); if (!sub) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_SUBPICTURE; } for (i = 0; i < num_surfaces; i++) { surf = handle_table_get(drv->htab, target_surfaces[i]); if (!surf) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_SURFACE; } } @@ -219,7 +219,7 @@ vlVaAssociateSubpicture(VADriverContextP ctx, VASubpictureID subpicture, if (!drv->pipe->screen->is_format_supported( drv->pipe->screen, tex_temp.format, tex_temp.target, tex_temp.nr_samples, tex_temp.bind)) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_ALLOCATION_FAILED; } @@ -230,7 +230,7 @@ vlVaAssociateSubpicture(VADriverContextP ctx, VASubpictureID subpicture, sub->sampler = drv->pipe->create_sampler_view(drv->pipe, tex, &sampler_templ); pipe_resource_reference(&tex, NULL); if (!sub->sampler) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_ALLOCATION_FAILED; } @@ -238,7 +238,7 @@ vlVaAssociateSubpicture(VADriverContextP ctx, VASubpictureID subpicture, surf = handle_table_get(drv->htab, target_surfaces[i]); util_dynarray_append(&surf->subpics, vlVaSubpicture *, sub); } - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_SUCCESS; } @@ -260,14 +260,14 @@ vlVaDeassociateSubpicture(VADriverContextP ctx, VASubpictureID subpicture, sub = handle_table_get(drv->htab, subpicture); if (!sub) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_SUBPICTURE; } for (i = 0; i < num_surfaces; i++) { surf = handle_table_get(drv->htab, target_surfaces[i]); if (!surf) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_SURFACE; } @@ -283,7 +283,7 @@ vlVaDeassociateSubpicture(VADriverContextP ctx, VASubpictureID subpicture, while (surf->subpics.size && util_dynarray_top(&surf->subpics, vlVaSubpicture *) == NULL) (void)util_dynarray_pop(&surf->subpics, vlVaSubpicture *); } - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_SUCCESS; } diff --git a/src/gallium/state_trackers/va/surface.c b/src/gallium/state_trackers/va/surface.c index 363ae66d0c5..1d8d981d1c2 100644 --- a/src/gallium/state_trackers/va/surface.c +++ b/src/gallium/state_trackers/va/surface.c @@ -74,7 +74,7 @@ vlVaDestroySurfaces(VADriverContextP ctx, VASurfaceID *surface_list, int num_sur for (i = 0; i < num_surfaces; ++i) { vlVaSurface *surf = handle_table_get(drv->htab, surface_list[i]); if (!surf) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_SURFACE; } if (surf->buffer) @@ -83,7 +83,7 @@ vlVaDestroySurfaces(VADriverContextP ctx, VASurfaceID *surface_list, int num_sur FREE(surf); handle_table_remove(drv->htab, surface_list[i]); } - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_SUCCESS; } @@ -106,19 +106,19 @@ vlVaSyncSurface(VADriverContextP ctx, VASurfaceID render_target) surf = handle_table_get(drv->htab, render_target); if (!surf || !surf->buffer) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_SURFACE; } if (!surf->feedback) { // No outstanding operation: nothing to do. - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_SUCCESS; } context = handle_table_get(drv->htab, surf->ctx); if (!context) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_CONTEXT; } @@ -137,7 +137,7 @@ vlVaSyncSurface(VADriverContextP ctx, VASurfaceID render_target) context->decoder->get_feedback(context->decoder, surf->feedback, &(surf->coded_buf->coded_size)); surf->feedback = NULL; } - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_SUCCESS; } @@ -291,7 +291,7 @@ vlVaPutSurface(VADriverContextP ctx, VASurfaceID surface_id, void* draw, short s mtx_lock(&drv->mutex); surf = handle_table_get(drv->htab, surface_id); if (!surf) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_SURFACE; } @@ -300,7 +300,7 @@ vlVaPutSurface(VADriverContextP ctx, VASurfaceID surface_id, void* draw, short s tex = vscreen->texture_from_drawable(vscreen, draw); if (!tex) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_DISPLAY; } @@ -311,7 +311,7 @@ vlVaPutSurface(VADriverContextP ctx, VASurfaceID surface_id, void* draw, short s surf_draw = drv->pipe->create_surface(drv->pipe, tex, &surf_templ); if (!surf_draw) { pipe_resource_reference(&tex, NULL); - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_ERROR_INVALID_DISPLAY; } @@ -327,7 +327,7 @@ vlVaPutSurface(VADriverContextP ctx, VASurfaceID surface_id, void* draw, short s status = vlVaPutSubpictures(surf, drv, surf_draw, dirty_area, &src_rect, &dst_rect); if (status) { - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return status; } @@ -342,7 +342,7 @@ vlVaPutSurface(VADriverContextP ctx, VASurfaceID surface_id, void* draw, short s pipe_resource_reference(&tex, NULL); pipe_surface_reference(&surf_draw, NULL); - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_SUCCESS; } @@ -401,7 +401,7 @@ vlVaQuerySurfaceAttributes(VADriverContextP ctx, VAConfigID config_id, mtx_lock(&drv->mutex); config = handle_table_get(drv->htab, config_id); - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); if (!config) return VA_STATUS_ERROR_INVALID_CONFIG; @@ -723,12 +723,12 @@ vlVaCreateSurfaces2(VADriverContextP ctx, unsigned int format, assert(0); } } - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); return VA_STATUS_SUCCESS; no_res: - pipe_mutex_unlock(drv->mutex); + mtx_unlock(&drv->mutex); if (i) vlVaDestroySurfaces(ctx, surfaces, i); diff --git a/src/gallium/state_trackers/vdpau/bitmap.c b/src/gallium/state_trackers/vdpau/bitmap.c index 14f6c36c6cc..643be75e618 100644 --- a/src/gallium/state_trackers/vdpau/bitmap.c +++ b/src/gallium/state_trackers/vdpau/bitmap.c @@ -102,7 +102,7 @@ vlVdpBitmapSurfaceCreate(VdpDevice device, goto err_unlock; } - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); *surface = vlAddDataHTAB(vlsurface); if (*surface == 0) { @@ -116,7 +116,7 @@ vlVdpBitmapSurfaceCreate(VdpDevice device, err_sampler: pipe_sampler_view_reference(&vlsurface->sampler_view, NULL); err_unlock: - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); DeviceReference(&vlsurface->device, NULL); FREE(vlsurface); return ret; @@ -136,7 +136,7 @@ vlVdpBitmapSurfaceDestroy(VdpBitmapSurface surface) mtx_lock(&vlsurface->device->mutex); pipe_sampler_view_reference(&vlsurface->sampler_view, NULL); - pipe_mutex_unlock(vlsurface->device->mutex); + mtx_unlock(&vlsurface->device->mutex); vlRemoveDataHTAB(surface); DeviceReference(&vlsurface->device, NULL); @@ -203,7 +203,7 @@ vlVdpBitmapSurfacePutBitsNative(VdpBitmapSurface surface, PIPE_TRANSFER_WRITE, &dst_box, *source_data, *source_pitches, 0); - pipe_mutex_unlock(vlsurface->device->mutex); + mtx_unlock(&vlsurface->device->mutex); return VDP_STATUS_OK; } diff --git a/src/gallium/state_trackers/vdpau/decode.c b/src/gallium/state_trackers/vdpau/decode.c index 0f8b8ff606e..66d52257717 100644 --- a/src/gallium/state_trackers/vdpau/decode.c +++ b/src/gallium/state_trackers/vdpau/decode.c @@ -81,7 +81,7 @@ vlVdpDecoderCreate(VdpDevice device, PIPE_VIDEO_CAP_SUPPORTED ); if (!supported) { - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); return VDP_STATUS_INVALID_DECODER_PROFILE; } @@ -100,13 +100,13 @@ vlVdpDecoderCreate(VdpDevice device, PIPE_VIDEO_CAP_MAX_HEIGHT ); if (width > maxwidth || height > maxheight) { - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); return VDP_STATUS_INVALID_SIZE; } vldecoder = CALLOC(1,sizeof(vlVdpDecoder)); if (!vldecoder) { - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); return VDP_STATUS_RESOURCES; } @@ -137,7 +137,7 @@ vlVdpDecoderCreate(VdpDevice device, } (void) mtx_init(&vldecoder->mutex, mtx_plain); - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); return VDP_STATUS_OK; @@ -145,7 +145,7 @@ error_handle: vldecoder->decoder->destroy(vldecoder->decoder); error_decoder: - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); DeviceReference(&vldecoder->device, NULL); FREE(vldecoder); return ret; @@ -165,7 +165,7 @@ vlVdpDecoderDestroy(VdpDecoder decoder) mtx_lock(&vldecoder->mutex); vldecoder->decoder->destroy(vldecoder->decoder); - pipe_mutex_unlock(vldecoder->mutex); + mtx_unlock(&vldecoder->mutex); mtx_destroy(&vldecoder->mutex); vlRemoveDataHTAB(decoder); @@ -633,11 +633,11 @@ vlVdpDecoderRender(VdpDecoder decoder, /* still no luck? get me out of here... */ if (!vlsurf->video_buffer) { - pipe_mutex_unlock(vlsurf->device->mutex); + mtx_unlock(&vlsurf->device->mutex); return VDP_STATUS_NO_IMPLEMENTATION; } vlVdpVideoSurfaceClear(vlsurf); - pipe_mutex_unlock(vlsurf->device->mutex); + mtx_unlock(&vlsurf->device->mutex); } for (i = 0; i < bitstream_buffer_count; ++i) { @@ -678,6 +678,6 @@ vlVdpDecoderRender(VdpDecoder decoder, dec->begin_frame(dec, vlsurf->video_buffer, &desc.base); dec->decode_bitstream(dec, vlsurf->video_buffer, &desc.base, bitstream_buffer_count, buffers, sizes); dec->end_frame(dec, vlsurf->video_buffer, &desc.base); - pipe_mutex_unlock(vldecoder->mutex); + mtx_unlock(&vldecoder->mutex); return ret; } diff --git a/src/gallium/state_trackers/vdpau/htab.c b/src/gallium/state_trackers/vdpau/htab.c index f938a19547e..f596b2d571f 100644 --- a/src/gallium/state_trackers/vdpau/htab.c +++ b/src/gallium/state_trackers/vdpau/htab.c @@ -42,7 +42,7 @@ boolean vlCreateHTAB(void) if (!htab) htab = handle_table_create(); ret = htab != NULL; - pipe_mutex_unlock(htab_lock); + mtx_unlock(&htab_lock); return ret; } @@ -53,7 +53,7 @@ void vlDestroyHTAB(void) handle_table_destroy(htab); htab = NULL; } - pipe_mutex_unlock(htab_lock); + mtx_unlock(&htab_lock); } vlHandle vlAddDataHTAB(void *data) @@ -64,7 +64,7 @@ vlHandle vlAddDataHTAB(void *data) mtx_lock(&htab_lock); if (htab) handle = handle_table_add(htab, data); - pipe_mutex_unlock(htab_lock); + mtx_unlock(&htab_lock); return handle; } @@ -76,7 +76,7 @@ void* vlGetDataHTAB(vlHandle handle) mtx_lock(&htab_lock); if (htab) data = handle_table_get(htab, handle); - pipe_mutex_unlock(htab_lock); + mtx_unlock(&htab_lock); return data; } @@ -85,5 +85,5 @@ void vlRemoveDataHTAB(vlHandle handle) mtx_lock(&htab_lock); if (htab) handle_table_remove(htab, handle); - pipe_mutex_unlock(htab_lock); + mtx_unlock(&htab_lock); } diff --git a/src/gallium/state_trackers/vdpau/mixer.c b/src/gallium/state_trackers/vdpau/mixer.c index a1c0377ec38..76b52255ef2 100644 --- a/src/gallium/state_trackers/vdpau/mixer.c +++ b/src/gallium/state_trackers/vdpau/mixer.c @@ -162,7 +162,7 @@ vlVdpVideoMixerCreate(VdpDevice device, } vmixer->luma_key.luma_min = 1.0f; vmixer->luma_key.luma_max = 0.0f; - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); return VDP_STATUS_OK; @@ -173,7 +173,7 @@ no_handle: err_csc_matrix: vl_compositor_cleanup_state(&vmixer->cstate); no_compositor_state: - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); DeviceReference(&vmixer->device, NULL); FREE(vmixer); return ret; @@ -216,7 +216,7 @@ vlVdpVideoMixerDestroy(VdpVideoMixer mixer) vl_bicubic_filter_cleanup(vmixer->bicubic.filter); FREE(vmixer->bicubic.filter); } - pipe_mutex_unlock(vmixer->device->mutex); + mtx_unlock(&vmixer->device->mutex); DeviceReference(&vmixer->device, NULL); FREE(vmixer); @@ -312,7 +312,7 @@ VdpStatus vlVdpVideoMixerRender(VdpVideoMixer mixer, break; default: - pipe_mutex_unlock(vmixer->device->mutex); + mtx_unlock(&vmixer->device->mutex); return VDP_STATUS_INVALID_VIDEO_MIXER_PICTURE_STRUCTURE; } @@ -387,7 +387,7 @@ VdpStatus vlVdpVideoMixerRender(VdpVideoMixer mixer, for (i = 0; i < layer_count; ++i) { vlVdpOutputSurface *src = vlGetDataHTAB(layers->source_surface); if (!src) { - pipe_mutex_unlock(vmixer->device->mutex); + mtx_unlock(&vmixer->device->mutex); return VDP_STATUS_INVALID_HANDLE; } @@ -454,7 +454,7 @@ VdpStatus vlVdpVideoMixerRender(VdpVideoMixer mixer, pipe_sampler_view_reference(&sampler_view, NULL); pipe_surface_reference(&surface, NULL); } - pipe_mutex_unlock(vmixer->device->mutex); + mtx_unlock(&vmixer->device->mutex); return VDP_STATUS_OK; } @@ -694,7 +694,7 @@ vlVdpVideoMixerSetFeatureEnables(VdpVideoMixer mixer, if (!debug_get_bool_option("G3DVL_NO_CSC", FALSE)) if (!vl_compositor_set_csc_matrix(&vmixer->cstate, (const vl_csc_matrix *)&vmixer->csc, vmixer->luma_key.luma_min, vmixer->luma_key.luma_max)) { - pipe_mutex_unlock(vmixer->device->mutex); + mtx_unlock(&vmixer->device->mutex); return VDP_STATUS_ERROR; } break; @@ -705,11 +705,11 @@ vlVdpVideoMixerSetFeatureEnables(VdpVideoMixer mixer, break; default: - pipe_mutex_unlock(vmixer->device->mutex); + mtx_unlock(&vmixer->device->mutex); return VDP_STATUS_INVALID_VIDEO_MIXER_FEATURE; } } - pipe_mutex_unlock(vmixer->device->mutex); + mtx_unlock(&vmixer->device->mutex); return VDP_STATUS_OK; } @@ -889,11 +889,11 @@ vlVdpVideoMixerSetAttributeValues(VdpVideoMixer mixer, goto fail; } } - pipe_mutex_unlock(vmixer->device->mutex); + mtx_unlock(&vmixer->device->mutex); return VDP_STATUS_OK; fail: - pipe_mutex_unlock(vmixer->device->mutex); + mtx_unlock(&vmixer->device->mutex); return ret; } @@ -987,11 +987,11 @@ vlVdpVideoMixerGetAttributeValues(VdpVideoMixer mixer, *(uint8_t*)attribute_values[i] = vmixer->skip_chroma_deint; break; default: - pipe_mutex_unlock(vmixer->device->mutex); + mtx_unlock(&vmixer->device->mutex); return VDP_STATUS_INVALID_VIDEO_MIXER_ATTRIBUTE; } } - pipe_mutex_unlock(vmixer->device->mutex); + mtx_unlock(&vmixer->device->mutex); return VDP_STATUS_OK; } diff --git a/src/gallium/state_trackers/vdpau/output.c b/src/gallium/state_trackers/vdpau/output.c index 5836395bacc..8ef826836c1 100644 --- a/src/gallium/state_trackers/vdpau/output.c +++ b/src/gallium/state_trackers/vdpau/output.c @@ -122,7 +122,7 @@ vlVdpOutputSurfaceCreate(VdpDevice device, goto err_resource; vl_compositor_reset_dirty_area(&vlsurface->dirty_area); - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); return VDP_STATUS_OK; @@ -131,7 +131,7 @@ err_resource: pipe_surface_reference(&vlsurface->surface, NULL); pipe_resource_reference(&res, NULL); err_unlock: - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); DeviceReference(&vlsurface->device, NULL); FREE(vlsurface); return VDP_STATUS_ERROR; @@ -158,7 +158,7 @@ vlVdpOutputSurfaceDestroy(VdpOutputSurface surface) pipe_sampler_view_reference(&vlsurface->sampler_view, NULL); pipe->screen->fence_reference(pipe->screen, &vlsurface->fence, NULL); vl_compositor_cleanup_state(&vlsurface->cstate); - pipe_mutex_unlock(vlsurface->device->mutex); + mtx_unlock(&vlsurface->device->mutex); vlRemoveDataHTAB(surface); DeviceReference(&vlsurface->device, NULL); @@ -222,7 +222,7 @@ vlVdpOutputSurfaceGetBitsNative(VdpOutputSurface surface, box = RectToPipeBox(source_rect, res); map = pipe->transfer_map(pipe, res, 0, PIPE_TRANSFER_READ, &box, &transfer); if (!map) { - pipe_mutex_unlock(vlsurface->device->mutex); + mtx_unlock(&vlsurface->device->mutex); return VDP_STATUS_RESOURCES; } @@ -230,7 +230,7 @@ vlVdpOutputSurfaceGetBitsNative(VdpOutputSurface surface, box.width, box.height, map, transfer->stride, 0, 0); pipe_transfer_unmap(pipe, transfer); - pipe_mutex_unlock(vlsurface->device->mutex); + mtx_unlock(&vlsurface->device->mutex); return VDP_STATUS_OK; } @@ -266,14 +266,14 @@ vlVdpOutputSurfacePutBitsNative(VdpOutputSurface surface, /* Check for a no-op. (application bug?) */ if (!dst_box.width || !dst_box.height) { - pipe_mutex_unlock(vlsurface->device->mutex); + mtx_unlock(&vlsurface->device->mutex); return VDP_STATUS_OK; } pipe->texture_subdata(pipe, vlsurface->sampler_view->texture, 0, PIPE_TRANSFER_WRITE, &dst_box, *source_data, *source_pitches, 0); - pipe_mutex_unlock(vlsurface->device->mutex); + mtx_unlock(&vlsurface->device->mutex); return VDP_STATUS_OK; } @@ -410,14 +410,14 @@ vlVdpOutputSurfacePutBitsIndexed(VdpOutputSurface surface, pipe_sampler_view_reference(&sv_idx, NULL); pipe_sampler_view_reference(&sv_tbl, NULL); - pipe_mutex_unlock(vlsurface->device->mutex); + mtx_unlock(&vlsurface->device->mutex); return VDP_STATUS_OK; error_resource: pipe_sampler_view_reference(&sv_idx, NULL); pipe_sampler_view_reference(&sv_tbl, NULL); - pipe_mutex_unlock(vlsurface->device->mutex); + mtx_unlock(&vlsurface->device->mutex); return VDP_STATUS_RESOURCES; } @@ -476,14 +476,14 @@ vlVdpOutputSurfacePutBitsYCbCr(VdpOutputSurface surface, vbuffer = pipe->create_video_buffer(pipe, &vtmpl); if (!vbuffer) { - pipe_mutex_unlock(vlsurface->device->mutex); + mtx_unlock(&vlsurface->device->mutex); return VDP_STATUS_RESOURCES; } sampler_views = vbuffer->get_sampler_view_planes(vbuffer); if (!sampler_views) { vbuffer->destroy(vbuffer); - pipe_mutex_unlock(vlsurface->device->mutex); + mtx_unlock(&vlsurface->device->mutex); return VDP_STATUS_RESOURCES; } @@ -516,12 +516,12 @@ vlVdpOutputSurfacePutBitsYCbCr(VdpOutputSurface surface, vl_compositor_render(cstate, compositor, vlsurface->surface, &vlsurface->dirty_area, false); vbuffer->destroy(vbuffer); - pipe_mutex_unlock(vlsurface->device->mutex); + mtx_unlock(&vlsurface->device->mutex); return VDP_STATUS_OK; err_csc_matrix: vbuffer->destroy(vbuffer); - pipe_mutex_unlock(vlsurface->device->mutex); + mtx_unlock(&vlsurface->device->mutex); return VDP_STATUS_ERROR; } @@ -701,7 +701,7 @@ vlVdpOutputSurfaceRenderOutputSurface(VdpOutputSurface destination_surface, vl_compositor_render(cstate, compositor, dst_vlsurface->surface, &dst_vlsurface->dirty_area, false); context->delete_blend_state(context, blend); - pipe_mutex_unlock(dst_vlsurface->device->mutex); + mtx_unlock(&dst_vlsurface->device->mutex); return VDP_STATUS_OK; } @@ -767,7 +767,7 @@ vlVdpOutputSurfaceRenderBitmapSurface(VdpOutputSurface destination_surface, vl_compositor_render(cstate, compositor, dst_vlsurface->surface, &dst_vlsurface->dirty_area, false); context->delete_blend_state(context, blend); - pipe_mutex_unlock(dst_vlsurface->device->mutex); + mtx_unlock(&dst_vlsurface->device->mutex); return VDP_STATUS_OK; } @@ -782,7 +782,7 @@ struct pipe_resource *vlVdpOutputSurfaceGallium(VdpOutputSurface surface) mtx_lock(&vlsurface->device->mutex); vlsurface->device->context->flush(vlsurface->device->context, NULL, 0); - pipe_mutex_unlock(vlsurface->device->mutex); + mtx_unlock(&vlsurface->device->mutex); return vlsurface->surface->texture; } @@ -811,11 +811,11 @@ VdpStatus vlVdpOutputSurfaceDMABuf(VdpOutputSurface surface, if (!pscreen->resource_get_handle(pscreen, vlsurface->device->context, vlsurface->surface->texture, &whandle, PIPE_HANDLE_USAGE_READ_WRITE)) { - pipe_mutex_unlock(vlsurface->device->mutex); + mtx_unlock(&vlsurface->device->mutex); return VDP_STATUS_NO_IMPLEMENTATION; } - pipe_mutex_unlock(vlsurface->device->mutex); + mtx_unlock(&vlsurface->device->mutex); result->handle = whandle.handle; result->width = vlsurface->surface->width; diff --git a/src/gallium/state_trackers/vdpau/presentation.c b/src/gallium/state_trackers/vdpau/presentation.c index ee32bac1361..7869f4c5031 100644 --- a/src/gallium/state_trackers/vdpau/presentation.c +++ b/src/gallium/state_trackers/vdpau/presentation.c @@ -67,11 +67,11 @@ vlVdpPresentationQueueCreate(VdpDevice device, mtx_lock(&dev->mutex); if (!vl_compositor_init_state(&pq->cstate, dev->context)) { - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); ret = VDP_STATUS_ERROR; goto no_compositor; } - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); *presentation_queue = vlAddDataHTAB(pq); if (*presentation_queue == 0) { @@ -102,7 +102,7 @@ vlVdpPresentationQueueDestroy(VdpPresentationQueue presentation_queue) mtx_lock(&pq->device->mutex); vl_compositor_cleanup_state(&pq->cstate); - pipe_mutex_unlock(pq->device->mutex); + mtx_unlock(&pq->device->mutex); vlRemoveDataHTAB(presentation_queue); DeviceReference(&pq->device, NULL); @@ -135,7 +135,7 @@ vlVdpPresentationQueueSetBackgroundColor(VdpPresentationQueue presentation_queue mtx_lock(&pq->device->mutex); vl_compositor_set_clear_color(&pq->cstate, &color); - pipe_mutex_unlock(pq->device->mutex); + mtx_unlock(&pq->device->mutex); return VDP_STATUS_OK; } @@ -159,7 +159,7 @@ vlVdpPresentationQueueGetBackgroundColor(VdpPresentationQueue presentation_queue mtx_lock(&pq->device->mutex); vl_compositor_get_clear_color(&pq->cstate, &color); - pipe_mutex_unlock(pq->device->mutex); + mtx_unlock(&pq->device->mutex); background_color->red = color.f[0]; background_color->green = color.f[1]; @@ -188,7 +188,7 @@ vlVdpPresentationQueueGetTime(VdpPresentationQueue presentation_queue, mtx_lock(&pq->device->mutex); *current_time = pq->device->vscreen->get_timestamp(pq->device->vscreen, (void *)pq->drawable); - pipe_mutex_unlock(pq->device->mutex); + mtx_unlock(&pq->device->mutex); return VDP_STATUS_OK; } @@ -235,7 +235,7 @@ vlVdpPresentationQueueDisplay(VdpPresentationQueue presentation_queue, vscreen->set_back_texture_from_output(vscreen, surf->surface->texture, clip_width, clip_height); tex = vscreen->texture_from_drawable(vscreen, (void *)pq->drawable); if (!tex) { - pipe_mutex_unlock(pq->device->mutex); + mtx_unlock(&pq->device->mutex); return VDP_STATUS_INVALID_HANDLE; } @@ -293,7 +293,7 @@ vlVdpPresentationQueueDisplay(VdpPresentationQueue presentation_queue, pipe_resource_reference(&tex, NULL); pipe_surface_reference(&surf_draw, NULL); } - pipe_mutex_unlock(pq->device->mutex); + mtx_unlock(&pq->device->mutex); return VDP_STATUS_OK; } @@ -327,7 +327,7 @@ vlVdpPresentationQueueBlockUntilSurfaceIdle(VdpPresentationQueue presentation_qu screen->fence_finish(screen, NULL, surf->fence, PIPE_TIMEOUT_INFINITE); screen->fence_reference(screen, &surf->fence, NULL); } - pipe_mutex_unlock(pq->device->mutex); + mtx_unlock(&pq->device->mutex); return vlVdpPresentationQueueGetTime(presentation_queue, first_presentation_time); } @@ -369,14 +369,14 @@ vlVdpPresentationQueueQuerySurfaceStatus(VdpPresentationQueue presentation_queue if (screen->fence_finish(screen, NULL, surf->fence, 0)) { screen->fence_reference(screen, &surf->fence, NULL); *status = VDP_PRESENTATION_QUEUE_STATUS_VISIBLE; - pipe_mutex_unlock(pq->device->mutex); + mtx_unlock(&pq->device->mutex); // We actually need to query the timestamp of the last VSYNC event from the hardware vlVdpPresentationQueueGetTime(presentation_queue, first_presentation_time); *first_presentation_time += 1; } else { *status = VDP_PRESENTATION_QUEUE_STATUS_QUEUED; - pipe_mutex_unlock(pq->device->mutex); + mtx_unlock(&pq->device->mutex); } } diff --git a/src/gallium/state_trackers/vdpau/query.c b/src/gallium/state_trackers/vdpau/query.c index 87011cb7e5e..6b8b5a6b5d3 100644 --- a/src/gallium/state_trackers/vdpau/query.c +++ b/src/gallium/state_trackers/vdpau/query.c @@ -87,7 +87,7 @@ vlVdpVideoSurfaceQueryCapabilities(VdpDevice device, VdpChromaType surface_chrom /* XXX: Current limits */ *is_supported = true; max_2d_texture_level = pscreen->get_param(pscreen, PIPE_CAP_MAX_TEXTURE_2D_LEVELS); - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); if (!max_2d_texture_level) return VDP_STATUS_RESOURCES; @@ -135,7 +135,7 @@ vlVdpVideoSurfaceQueryGetPutBitsYCbCrCapabilities(VdpDevice device, VdpChromaTyp PIPE_FORMAT_NV12, PIPE_VIDEO_PROFILE_UNKNOWN, PIPE_VIDEO_ENTRYPOINT_BITSTREAM)) { - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); return VDP_STATUS_OK; } break; @@ -162,7 +162,7 @@ vlVdpVideoSurfaceQueryGetPutBitsYCbCrCapabilities(VdpDevice device, VdpChromaTyp PIPE_VIDEO_PROFILE_UNKNOWN, PIPE_VIDEO_ENTRYPOINT_BITSTREAM ); - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); return VDP_STATUS_OK; } @@ -213,7 +213,7 @@ vlVdpDecoderQueryCapabilities(VdpDevice device, VdpDecoderProfile profile, *max_level = 0; *max_macroblocks = 0; } - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); return VDP_STATUS_OK; } @@ -255,7 +255,7 @@ vlVdpOutputSurfaceQueryCapabilities(VdpDevice device, VdpRGBAFormat surface_rgba pscreen, PIPE_CAP_MAX_TEXTURE_2D_LEVELS); if (!max_2d_texture_level) { - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); return VDP_STATUS_ERROR; } @@ -264,7 +264,7 @@ vlVdpOutputSurfaceQueryCapabilities(VdpDevice device, VdpRGBAFormat surface_rgba *max_width = 0; *max_height = 0; } - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); return VDP_STATUS_OK; } @@ -302,7 +302,7 @@ vlVdpOutputSurfaceQueryGetPutBitsNativeCapabilities(VdpDevice device, VdpRGBAFor pscreen, format, PIPE_TEXTURE_2D, 1, PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET ); - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); return VDP_STATUS_OK; } @@ -363,7 +363,7 @@ vlVdpOutputSurfaceQueryPutBitsIndexedCapabilities(VdpDevice device, pscreen, colortbl_format, PIPE_TEXTURE_1D, 1, PIPE_BIND_SAMPLER_VIEW ); - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); return VDP_STATUS_OK; } @@ -413,7 +413,7 @@ vlVdpOutputSurfaceQueryPutBitsYCbCrCapabilities(VdpDevice device, VdpRGBAFormat PIPE_VIDEO_PROFILE_UNKNOWN, PIPE_VIDEO_ENTRYPOINT_BITSTREAM ); - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); return VDP_STATUS_OK; } @@ -455,7 +455,7 @@ vlVdpBitmapSurfaceQueryCapabilities(VdpDevice device, VdpRGBAFormat surface_rgba pscreen, PIPE_CAP_MAX_TEXTURE_2D_LEVELS); if (!max_2d_texture_level) { - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); return VDP_STATUS_ERROR; } @@ -464,7 +464,7 @@ vlVdpBitmapSurfaceQueryCapabilities(VdpDevice device, VdpRGBAFormat surface_rgba *max_width = 0; *max_height = 0; } - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); return VDP_STATUS_OK; } @@ -556,10 +556,10 @@ vlVdpVideoMixerQueryParameterValueRange(VdpDevice device, VdpVideoMixerParameter case VDP_VIDEO_MIXER_PARAMETER_CHROMA_TYPE: default: - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); return VDP_STATUS_INVALID_VIDEO_MIXER_PARAMETER; } - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); return VDP_STATUS_OK; } diff --git a/src/gallium/state_trackers/vdpau/surface.c b/src/gallium/state_trackers/vdpau/surface.c index 39d58490606..884ae308319 100644 --- a/src/gallium/state_trackers/vdpau/surface.c +++ b/src/gallium/state_trackers/vdpau/surface.c @@ -104,7 +104,7 @@ vlVdpVideoSurfaceCreate(VdpDevice device, VdpChromaType chroma_type, /* do not mandate early allocation of a video buffer */ vlVdpVideoSurfaceClear(p_surf); - pipe_mutex_unlock(dev->mutex); + mtx_unlock(&dev->mutex); *surface = vlAddDataHTAB(p_surf); if (*surface == 0) { @@ -141,7 +141,7 @@ vlVdpVideoSurfaceDestroy(VdpVideoSurface surface) mtx_lock(&p_surf->device->mutex); if (p_surf->video_buffer) p_surf->video_buffer->destroy(p_surf->video_buffer); - pipe_mutex_unlock(p_surf->device->mutex); + mtx_unlock(&p_surf->device->mutex); vlRemoveDataHTAB(surface); DeviceReference(&p_surf->device, NULL); @@ -241,7 +241,7 @@ vlVdpVideoSurfaceGetBitsYCbCr(VdpVideoSurface surface, mtx_lock(&vlsurface->device->mutex); sampler_views = vlsurface->video_buffer->get_sampler_view_planes(vlsurface->video_buffer); if (!sampler_views) { - pipe_mutex_unlock(vlsurface->device->mutex); + mtx_unlock(&vlsurface->device->mutex); return VDP_STATUS_RESOURCES; } @@ -263,7 +263,7 @@ vlVdpVideoSurfaceGetBitsYCbCr(VdpVideoSurface surface, map = pipe->transfer_map(pipe, sv->texture, 0, PIPE_TRANSFER_READ, &box, &transfer); if (!map) { - pipe_mutex_unlock(vlsurface->device->mutex); + mtx_unlock(&vlsurface->device->mutex); return VDP_STATUS_RESOURCES; } @@ -288,7 +288,7 @@ vlVdpVideoSurfaceGetBitsYCbCr(VdpVideoSurface surface, pipe_transfer_unmap(pipe, transfer); } } - pipe_mutex_unlock(vlsurface->device->mutex); + mtx_unlock(&vlsurface->device->mutex); return VDP_STATUS_OK; } @@ -337,7 +337,7 @@ vlVdpVideoSurfacePutBitsYCbCr(VdpVideoSurface surface, PIPE_VIDEO_ENTRYPOINT_BITSTREAM, PIPE_VIDEO_CAP_PREFERED_FORMAT); if (nformat == PIPE_FORMAT_NONE) { - pipe_mutex_unlock(p_surf->device->mutex); + mtx_unlock(&p_surf->device->mutex); return VDP_STATUS_NO_IMPLEMENTATION; } } @@ -356,7 +356,7 @@ vlVdpVideoSurfacePutBitsYCbCr(VdpVideoSurface surface, /* stil no luck? ok forget it we don't support it */ if (!p_surf->video_buffer) { - pipe_mutex_unlock(p_surf->device->mutex); + mtx_unlock(&p_surf->device->mutex); return VDP_STATUS_NO_IMPLEMENTATION; } vlVdpVideoSurfaceClear(p_surf); @@ -373,7 +373,7 @@ vlVdpVideoSurfacePutBitsYCbCr(VdpVideoSurface surface, sampler_views = p_surf->video_buffer->get_sampler_view_planes(p_surf->video_buffer); if (!sampler_views) { - pipe_mutex_unlock(p_surf->device->mutex); + mtx_unlock(&p_surf->device->mutex); return VDP_STATUS_RESOURCES; } @@ -399,7 +399,7 @@ vlVdpVideoSurfacePutBitsYCbCr(VdpVideoSurface surface, map = pipe->transfer_map(pipe, tex, 0, usage, &dst_box, &transfer); if (!map) { - pipe_mutex_unlock(p_surf->device->mutex); + mtx_unlock(&p_surf->device->mutex); return VDP_STATUS_RESOURCES; } @@ -422,7 +422,7 @@ vlVdpVideoSurfacePutBitsYCbCr(VdpVideoSurface surface, usage |= PIPE_TRANSFER_UNSYNCHRONIZED; } } - pipe_mutex_unlock(p_surf->device->mutex); + mtx_unlock(&p_surf->device->mutex); return VDP_STATUS_OK; } @@ -472,7 +472,7 @@ struct pipe_video_buffer *vlVdpVideoSurfaceGallium(VdpVideoSurface surface) /* try to create a video buffer if we don't already have one */ p_surf->video_buffer = pipe->create_video_buffer(pipe, &p_surf->templat); } - pipe_mutex_unlock(p_surf->device->mutex); + mtx_unlock(&p_surf->device->mutex); return p_surf->video_buffer; } @@ -511,13 +511,13 @@ VdpStatus vlVdpVideoSurfaceDMABuf(VdpVideoSurface surface, /* Check if surface match interop requirements */ if (p_surf->video_buffer == NULL || !p_surf->video_buffer->interlaced || p_surf->video_buffer->buffer_format != PIPE_FORMAT_NV12) { - pipe_mutex_unlock(p_surf->device->mutex); + mtx_unlock(&p_surf->device->mutex); return VDP_STATUS_NO_IMPLEMENTATION; } surf = p_surf->video_buffer->get_surfaces(p_surf->video_buffer)[plane]; if (!surf) { - pipe_mutex_unlock(p_surf->device->mutex); + mtx_unlock(&p_surf->device->mutex); return VDP_STATUS_RESOURCES; } @@ -529,11 +529,11 @@ VdpStatus vlVdpVideoSurfaceDMABuf(VdpVideoSurface surface, if (!pscreen->resource_get_handle(pscreen, p_surf->device->context, surf->texture, &whandle, PIPE_HANDLE_USAGE_READ_WRITE)) { - pipe_mutex_unlock(p_surf->device->mutex); + mtx_unlock(&p_surf->device->mutex); return VDP_STATUS_NO_IMPLEMENTATION; } - pipe_mutex_unlock(p_surf->device->mutex); + mtx_unlock(&p_surf->device->mutex); result->handle = whandle.handle; result->width = surf->width; |