diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2016-11-16 19:01:19 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2016-11-16 19:04:21 +0300 |
| commit | 2bcb1b208a4193fb28f1e0c4408b733f5ee2c028 (patch) | |
| tree | 8b9260ffd9fb7b371dc66955903c7b0c7f4e7bf9 /source/gameengine | |
| parent | 930f999f6ea683d02ac490026a52817f1d965377 (diff) | |
| parent | 2a2eb0c463bd96d42f7306eb17f88cad87f73aea (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/VideoTexture/VideoDeckLink.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/VideoTexture/VideoDeckLink.cpp b/source/gameengine/VideoTexture/VideoDeckLink.cpp index 4f5e34896fc..c588a4b33cf 100644 --- a/source/gameengine/VideoTexture/VideoDeckLink.cpp +++ b/source/gameengine/VideoTexture/VideoDeckLink.cpp @@ -544,12 +544,12 @@ HRESULT STDMETHODCALLTYPE PinnedMemoryAllocator::QueryInterface(REFIID /*iid*/, ULONG STDMETHODCALLTYPE PinnedMemoryAllocator::AddRef(void) { - return atomic_add_uint32(&mRefCount, 1U); + return atomic_add_and_fetch_uint32(&mRefCount, 1U); } ULONG STDMETHODCALLTYPE PinnedMemoryAllocator::Release(void) { - uint32_t newCount = atomic_sub_uint32(&mRefCount, 1U); + uint32_t newCount = atomic_sub_and_fetch_uint32(&mRefCount, 1U); if (newCount == 0) delete this; return (ULONG)newCount; |