diff options
| author | Chris Robinson <[email protected]> | 2018-09-21 02:37:37 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2018-09-21 04:14:15 -0700 |
| commit | b6d0ff02c2ec52d2c12a58f2be83b4c3eaa93afe (patch) | |
| tree | f0d8d0d56589b38d623dd746ff7435d3a63026b6 /OpenAL32 | |
| parent | f21e2df4cf0d51fda31f5607e1bf966459d9bf9d (diff) | |
Use an internal event to more timely release old effect states
Diffstat (limited to 'OpenAL32')
| -rw-r--r-- | OpenAL32/Include/alMain.h | 4 | ||||
| -rw-r--r-- | OpenAL32/alAuxEffectSlot.c | 3 | ||||
| -rw-r--r-- | OpenAL32/event.c | 7 |
3 files changed, 14 insertions, 0 deletions
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index 3a08e8c1..3e328157 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -760,6 +760,9 @@ enum { EventType_Performance = 1<<3, EventType_Deprecated = 1<<4, EventType_Disconnected = 1<<5, + + /* Internal events. */ + EventType_ReleaseEffectState = 65536, }; typedef struct AsyncEvent { @@ -772,6 +775,7 @@ typedef struct AsyncEvent { ALuint param; ALchar msg[1008]; } user; + struct ALeffectState *EffectState; } u; } AsyncEvent; #define ASYNC_EVENT(t) { t, { 0 } } diff --git a/OpenAL32/alAuxEffectSlot.c b/OpenAL32/alAuxEffectSlot.c index b293b6a5..8141e0f6 100644 --- a/OpenAL32/alAuxEffectSlot.c +++ b/OpenAL32/alAuxEffectSlot.c @@ -753,6 +753,9 @@ void UpdateEffectSlotProps(ALeffectslot *slot, ALCcontext *context) /* If there was an unused update container, put it back in the * freelist. */ + if(props->State) + ALeffectState_DecRef(props->State); + props->State = NULL; ATOMIC_REPLACE_HEAD(struct ALeffectslotProps*, &context->FreeEffectslotProps, props); } diff --git a/OpenAL32/event.c b/OpenAL32/event.c index c0bf4204..4c9c0be2 100644 --- a/OpenAL32/event.c +++ b/OpenAL32/event.c @@ -6,6 +6,7 @@ #include "AL/alext.h" #include "alMain.h" #include "alError.h" +#include "alAuxEffectSlot.h" #include "ringbuffer.h" @@ -30,6 +31,12 @@ int EventThread(void *arg) quitnow = evt.EnumType == EventType_KillThread; if(quitnow) break; + if(evt.EnumType == EventType_ReleaseEffectState) + { + ALeffectState_DecRef(evt.u.EffectState); + continue; + } + enabledevts = ATOMIC_LOAD(&context->EnabledEvts, almemory_order_acquire); if(context->EventCb && (enabledevts&evt.EnumType) == evt.EnumType) context->EventCb(evt.u.user.type, evt.u.user.id, evt.u.user.param, |