diff options
author | Chris Robinson <[email protected]> | 2018-02-02 22:59:06 -0800 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2018-02-02 22:59:06 -0800 |
commit | 80cc32d77b73e7c7625c35e37340c14e430c2618 (patch) | |
tree | c8dd3dd6f60ee7791ff6f643a98e7e47b87a183e | |
parent | 28fa82378b54ecbf3fb04de2ba1c61d7b6d90503 (diff) |
Remove the unused thunk code
-rw-r--r-- | Alc/ALc.c | 4 | ||||
-rw-r--r-- | CMakeLists.txt | 1 | ||||
-rw-r--r-- | OpenAL32/Include/alThunk.h | 20 | ||||
-rw-r--r-- | OpenAL32/alAuxEffectSlot.c | 1 | ||||
-rw-r--r-- | OpenAL32/alBuffer.c | 1 | ||||
-rw-r--r-- | OpenAL32/alEffect.c | 1 | ||||
-rw-r--r-- | OpenAL32/alFilter.c | 1 | ||||
-rw-r--r-- | OpenAL32/alSource.c | 1 | ||||
-rw-r--r-- | OpenAL32/alThunk.c | 108 |
9 files changed, 0 insertions, 138 deletions
@@ -32,7 +32,6 @@ #include "alMain.h" #include "alSource.h" #include "alListener.h" -#include "alThunk.h" #include "alSource.h" #include "alBuffer.h" #include "alAuxEffectSlot.h" @@ -882,8 +881,6 @@ static void alc_init(void) ret = almtx_init(&ListLock, almtx_recursive); assert(ret == althrd_success); - - ThunkInit(); } static void alc_initconfig(void) @@ -1237,7 +1234,6 @@ static void alc_deinit_safe(void) FreeHrtfs(); FreeALConfig(); - ThunkExit(); almtx_destroy(&ListLock); altss_delete(LocalContext); diff --git a/CMakeLists.txt b/CMakeLists.txt index b5c65c55..5d665e72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -707,7 +707,6 @@ SET(OPENAL_OBJS OpenAL32/alAuxEffectSlot.c OpenAL32/alListener.c OpenAL32/alSource.c OpenAL32/alState.c - OpenAL32/alThunk.c OpenAL32/event.c OpenAL32/sample_cvt.c ) diff --git a/OpenAL32/Include/alThunk.h b/OpenAL32/Include/alThunk.h deleted file mode 100644 index adc77dec..00000000 --- a/OpenAL32/Include/alThunk.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef ALTHUNK_H -#define ALTHUNK_H - -#include "alMain.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void ThunkInit(void); -void ThunkExit(void); -ALenum NewThunkEntry(ALuint *index); -void FreeThunkEntry(ALuint index); - -#ifdef __cplusplus -} -#endif - -#endif //ALTHUNK_H - diff --git a/OpenAL32/alAuxEffectSlot.c b/OpenAL32/alAuxEffectSlot.c index 5400a914..038adbb0 100644 --- a/OpenAL32/alAuxEffectSlot.c +++ b/OpenAL32/alAuxEffectSlot.c @@ -27,7 +27,6 @@ #include "AL/alc.h" #include "alMain.h" #include "alAuxEffectSlot.h" -#include "alThunk.h" #include "alError.h" #include "alListener.h" #include "alSource.h" diff --git a/OpenAL32/alBuffer.c b/OpenAL32/alBuffer.c index 02071abf..ed712434 100644 --- a/OpenAL32/alBuffer.c +++ b/OpenAL32/alBuffer.c @@ -32,7 +32,6 @@ #include "alu.h" #include "alError.h" #include "alBuffer.h" -#include "alThunk.h" #include "sample_cvt.h" diff --git a/OpenAL32/alEffect.c b/OpenAL32/alEffect.c index 39f6f330..f4258e60 100644 --- a/OpenAL32/alEffect.c +++ b/OpenAL32/alEffect.c @@ -28,7 +28,6 @@ #include "AL/alc.h" #include "alMain.h" #include "alEffect.h" -#include "alThunk.h" #include "alError.h" diff --git a/OpenAL32/alFilter.c b/OpenAL32/alFilter.c index de527fea..70ae901c 100644 --- a/OpenAL32/alFilter.c +++ b/OpenAL32/alFilter.c @@ -25,7 +25,6 @@ #include "alMain.h" #include "alu.h" #include "alFilter.h" -#include "alThunk.h" #include "alError.h" diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c index 7c978b98..e56e252c 100644 --- a/OpenAL32/alSource.c +++ b/OpenAL32/alSource.c @@ -31,7 +31,6 @@ #include "alError.h" #include "alSource.h" #include "alBuffer.h" -#include "alThunk.h" #include "alAuxEffectSlot.h" #include "backends/base.h" diff --git a/OpenAL32/alThunk.c b/OpenAL32/alThunk.c deleted file mode 100644 index 0d90760a..00000000 --- a/OpenAL32/alThunk.c +++ /dev/null @@ -1,108 +0,0 @@ -/** - * OpenAL cross platform audio library - * Copyright (C) 1999-2007 by authors. - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * Or go to http://www.gnu.org/copyleft/lgpl.html - */ - -#include "config.h" - -#include <stdlib.h> - -#include "alMain.h" -#include "alThunk.h" - -#include "almalloc.h" - - -static ATOMIC_FLAG *ThunkArray; -static ALsizei ThunkArraySize; -static RWLock ThunkLock; - -void ThunkInit(void) -{ - RWLockInit(&ThunkLock); - ThunkArraySize = 1024; - ThunkArray = al_calloc(16, ThunkArraySize * sizeof(*ThunkArray)); -} - -void ThunkExit(void) -{ - al_free(ThunkArray); - ThunkArray = NULL; - ThunkArraySize = 0; -} - -ALenum NewThunkEntry(ALuint *index) -{ - void *NewList; - ALsizei i; - - ReadLock(&ThunkLock); - for(i = 0;i < ThunkArraySize;i++) - { - if(!ATOMIC_FLAG_TEST_AND_SET(&ThunkArray[i], almemory_order_acq_rel)) - { - ReadUnlock(&ThunkLock); - *index = i+1; - return AL_NO_ERROR; - } - } - ReadUnlock(&ThunkLock); - - WriteLock(&ThunkLock); - /* Double-check that there's still no free entries, in case another - * invocation just came through and increased the size of the array. - */ - for(;i < ThunkArraySize;i++) - { - if(!ATOMIC_FLAG_TEST_AND_SET(&ThunkArray[i], almemory_order_acq_rel)) - { - WriteUnlock(&ThunkLock); - *index = i+1; - return AL_NO_ERROR; - } - } - - NewList = al_calloc(16, ThunkArraySize*2 * sizeof(*ThunkArray)); - if(!NewList) - { - WriteUnlock(&ThunkLock); - ERR("Realloc failed to increase to %u entries!\n", ThunkArraySize*2); - return AL_OUT_OF_MEMORY; - } - memcpy(NewList, ThunkArray, ThunkArraySize*sizeof(*ThunkArray)); - al_free(ThunkArray); - ThunkArray = NewList; - ThunkArraySize *= 2; - - ATOMIC_FLAG_TEST_AND_SET(&ThunkArray[i], almemory_order_seq_cst); - *index = ++i; - - for(;i < ThunkArraySize;i++) - ATOMIC_FLAG_CLEAR(&ThunkArray[i], almemory_order_relaxed); - WriteUnlock(&ThunkLock); - - return AL_NO_ERROR; -} - -void FreeThunkEntry(ALuint index) -{ - ReadLock(&ThunkLock); - if(index > 0 && (ALsizei)index <= ThunkArraySize) - ATOMIC_FLAG_CLEAR(&ThunkArray[index-1], almemory_order_release); - ReadUnlock(&ThunkLock); -} |