summaryrefslogtreecommitdiffstats
path: root/OpenAL32
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2014-04-10 20:49:01 -0700
committerChris Robinson <[email protected]>2014-04-10 20:49:01 -0700
commite76bc53d3724463f5375d303e13f385875f596e6 (patch)
tree459a1c30df4787750dcfdd911e7cad788b355611 /OpenAL32
parent90ae4b7c0f675e0a0846af376f6025ccfd8f7bc9 (diff)
Insert all new effect slots into the active effect slots at once
Diffstat (limited to 'OpenAL32')
-rw-r--r--OpenAL32/alAuxEffectSlot.c53
1 files changed, 27 insertions, 26 deletions
diff --git a/OpenAL32/alAuxEffectSlot.c b/OpenAL32/alAuxEffectSlot.c
index 42715c02..d4dabe0e 100644
--- a/OpenAL32/alAuxEffectSlot.c
+++ b/OpenAL32/alAuxEffectSlot.c
@@ -35,8 +35,8 @@
extern inline struct ALeffectslot *LookupEffectSlot(ALCcontext *context, ALuint id);
extern inline struct ALeffectslot *RemoveEffectSlot(ALCcontext *context, ALuint id);
-static ALenum AddEffectSlotArray(ALCcontext *Context, ALsizei count, const ALuint *slots);
-static ALvoid RemoveEffectSlotArray(ALCcontext *Context, ALeffectslot *slot);
+static ALenum AddEffectSlotArray(ALCcontext *Context, const_vector_ALeffectslotPtr slots);
+static void RemoveEffectSlotArray(ALCcontext *Context, const ALeffectslot *slot);
static UIntMap EffectStateFactoryMap;
@@ -52,14 +52,20 @@ static inline ALeffectStateFactory *getFactoryByType(ALenum type)
AL_API ALvoid AL_APIENTRY alGenAuxiliaryEffectSlots(ALsizei n, ALuint *effectslots)
{
ALCcontext *context;
+ vector_ALeffectslotPtr slotvec;
ALsizei cur;
ALenum err;
context = GetContextRef();
if(!context) return;
+ VECTOR_INIT(slotvec);
+
if(!(n >= 0))
SET_ERROR_AND_GOTO(context, AL_INVALID_VALUE, done);
+ if(!VECTOR_RESERVE(slotvec, n))
+ SET_ERROR_AND_GOTO(context, AL_OUT_OF_MEMORY, done);
+
for(cur = 0;cur < n;cur++)
{
ALeffectslot *slot = al_calloc(16, sizeof(ALeffectslot));
@@ -84,9 +90,11 @@ AL_API ALvoid AL_APIENTRY alGenAuxiliaryEffectSlots(ALsizei n, ALuint *effectslo
SET_ERROR_AND_GOTO(context, err, done);
}
+ VECTOR_PUSH_BACK(slotvec, slot);
+
effectslots[cur] = slot->id;
}
- err = AddEffectSlotArray(context, n, effectslots);
+ err = AddEffectSlotArray(context, slotvec);
if(err != AL_NO_ERROR)
{
alDeleteAuxiliaryEffectSlots(cur, effectslots);
@@ -94,6 +102,8 @@ AL_API ALvoid AL_APIENTRY alGenAuxiliaryEffectSlots(ALsizei n, ALuint *effectslo
}
done:
+ VECTOR_DEINIT(slotvec);
+
ALCcontext_DecRef(context);
}
@@ -375,7 +385,20 @@ done:
}
-static ALvoid RemoveEffectSlotArray(ALCcontext *context, ALeffectslot *slot)
+static ALenum AddEffectSlotArray(ALCcontext *context, const_vector_ALeffectslotPtr slots)
+{
+ ALenum err = AL_NO_ERROR;
+
+ LockContext(context);
+ if(!VECTOR_INSERT(context->ActiveAuxSlots, VECTOR_ITER_END(context->ActiveAuxSlots),
+ VECTOR_ITER_BEGIN(slots), VECTOR_ITER_END(slots)))
+ err = AL_OUT_OF_MEMORY;
+ UnlockContext(context);
+
+ return err;
+}
+
+static void RemoveEffectSlotArray(ALCcontext *context, const ALeffectslot *slot)
{
ALeffectslot **slotlist, **slotlistend;
@@ -395,28 +418,6 @@ static ALvoid RemoveEffectSlotArray(ALCcontext *context, ALeffectslot *slot)
UnlockContext(context);
}
-static ALenum AddEffectSlotArray(ALCcontext *context, ALsizei count, const ALuint *slots)
-{
- ALsizei total = count + VECTOR_SIZE(context->ActiveAuxSlots);
-
- LockContext(context);
- if(total < VECTOR_SIZE(context->ActiveAuxSlots) || VECTOR_RESERVE(context->ActiveAuxSlots, total) == AL_FALSE)
- {
- UnlockContext(context);
- return AL_OUT_OF_MEMORY;
- }
-
- while(VECTOR_SIZE(context->ActiveAuxSlots) < total)
- {
- ALeffectslot *slot = LookupEffectSlot(context, *(slots++));
- assert(slot != NULL);
- VECTOR_PUSH_BACK(context->ActiveAuxSlots, slot);
- }
- UnlockContext(context);
-
- return AL_NO_ERROR;
-}
-
void InitEffectFactoryMap(void)
{