Remove unnecessary atomic members

6 files changed, 135 insertions, 141 deletions

diff --git a/OpenAL32/Include/alAuxEffectSlot.h b/OpenAL32/Include/alAuxEffectSlot.h
index 40ff1393..3c24f80c 100644
--- a/OpenAL32/Include/alAuxEffectSlot.h
+++ b/OpenAL32/Include/alAuxEffectSlot.h
@@ -75,13 +75,13 @@ static const struct ALeffectStateFactoryVtable T##_ALeffectStateFactory_vtable =
 
 
 struct ALeffectslotProps {
-    ATOMIC(ALfloat)   Gain;
-    ATOMIC(ALboolean) AuxSendAuto;
+    ALfloat   Gain;
+    ALboolean AuxSendAuto;
 
-    ATOMIC(ALenum) Type;
+    ALenum Type;
     ALeffectProps Props;
 
-    ATOMIC(ALeffectState*) State;
+    ALeffectState *State;
 
     ATOMIC(struct ALeffectslotProps*) next;
 };
diff --git a/OpenAL32/Include/alListener.h b/OpenAL32/Include/alListener.h
index b89a00e7..9a7f9d49 100644
--- a/OpenAL32/Include/alListener.h
+++ b/OpenAL32/Include/alListener.h
@@ -9,29 +9,29 @@ extern "C" {
 #endif
 
 struct ALlistenerProps {
-    ATOMIC(ALfloat) Position[3];
-    ATOMIC(ALfloat) Velocity[3];
-    ATOMIC(ALfloat) Forward[3];
-    ATOMIC(ALfloat) Up[3];
-    ATOMIC(ALfloat) Gain;
-    ATOMIC(ALfloat) MetersPerUnit;
+    ALfloat Position[3];
+    ALfloat Velocity[3];
+    ALfloat Forward[3];
+    ALfloat Up[3];
+    ALfloat Gain;
+    ALfloat MetersPerUnit;
 
-    ATOMIC(ALfloat) DopplerFactor;
-    ATOMIC(ALfloat) DopplerVelocity;
-    ATOMIC(ALfloat) SpeedOfSound;
-    ATOMIC(ALboolean) SourceDistanceModel;
-    ATOMIC(enum DistanceModel) DistanceModel;
+    ALfloat DopplerFactor;
+    ALfloat DopplerVelocity;
+    ALfloat SpeedOfSound;
+    ALboolean SourceDistanceModel;
+    enum DistanceModel DistanceModel;
 
     ATOMIC(struct ALlistenerProps*) next;
 };
 
 typedef struct ALlistener {
-    volatile ALfloat Position[3];
-    volatile ALfloat Velocity[3];
-    volatile ALfloat Forward[3];
-    volatile ALfloat Up[3];
-    volatile ALfloat Gain;
-    volatile ALfloat MetersPerUnit;
+    ALfloat Position[3];
+    ALfloat Velocity[3];
+    ALfloat Forward[3];
+    ALfloat Up[3];
+    ALfloat Gain;
+    ALfloat MetersPerUnit;
 
     /* Pointer to the most recent property values that are awaiting an update.
      */
diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h
index 2525f107..12b4587b 100644
--- a/OpenAL32/Include/alSource.h
+++ b/OpenAL32/Include/alSource.h
@@ -27,52 +27,52 @@ typedef struct ALbufferlistitem {
 struct ALsourceProps {
     ATOMIC(struct ALsourceProps*) next;
 
-    ATOMIC(ALfloat)   Pitch;
-    ATOMIC(ALfloat)   Gain;
-    ATOMIC(ALfloat)   OuterGain;
-    ATOMIC(ALfloat)   MinGain;
-    ATOMIC(ALfloat)   MaxGain;
-    ATOMIC(ALfloat)   InnerAngle;
-    ATOMIC(ALfloat)   OuterAngle;
-    ATOMIC(ALfloat)   RefDistance;
-    ATOMIC(ALfloat)   MaxDistance;
-    ATOMIC(ALfloat)   RollOffFactor;
-    ATOMIC(ALfloat)   Position[3];
-    ATOMIC(ALfloat)   Velocity[3];
-    ATOMIC(ALfloat)   Direction[3];
-    ATOMIC(ALfloat)   Orientation[2][3];
-    ATOMIC(ALboolean) HeadRelative;
-    ATOMIC(enum DistanceModel) DistanceModel;
-    ATOMIC(ALboolean) DirectChannels;
-
-    ATOMIC(ALboolean) DryGainHFAuto;
-    ATOMIC(ALboolean) WetGainAuto;
-    ATOMIC(ALboolean) WetGainHFAuto;
-    ATOMIC(ALfloat)   OuterGainHF;
-
-    ATOMIC(ALfloat) AirAbsorptionFactor;
-    ATOMIC(ALfloat) RoomRolloffFactor;
-    ATOMIC(ALfloat) DopplerFactor;
-
-    ATOMIC(ALfloat) StereoPan[2];
-
-    ATOMIC(ALfloat) Radius;
+    ALfloat Pitch;
+    ALfloat Gain;
+    ALfloat OuterGain;
+    ALfloat MinGain;
+    ALfloat MaxGain;
+    ALfloat InnerAngle;
+    ALfloat OuterAngle;
+    ALfloat RefDistance;
+    ALfloat MaxDistance;
+    ALfloat RollOffFactor;
+    ALfloat Position[3];
+    ALfloat Velocity[3];
+    ALfloat Direction[3];
+    ALfloat Orientation[2][3];
+    ALboolean HeadRelative;
+    enum DistanceModel DistanceModel;
+    ALboolean DirectChannels;
+
+    ALboolean DryGainHFAuto;
+    ALboolean WetGainAuto;
+    ALboolean WetGainHFAuto;
+    ALfloat   OuterGainHF;
+
+    ALfloat AirAbsorptionFactor;
+    ALfloat RoomRolloffFactor;
+    ALfloat DopplerFactor;
+
+    ALfloat StereoPan[2];
+
+    ALfloat Radius;
 
     /** Direct filter and auxiliary send info. */
     struct {
-        ATOMIC(ALfloat) Gain;
-        ATOMIC(ALfloat) GainHF;
-        ATOMIC(ALfloat) HFReference;
-        ATOMIC(ALfloat) GainLF;
-        ATOMIC(ALfloat) LFReference;
+        ALfloat Gain;
+        ALfloat GainHF;
+        ALfloat HFReference;
+        ALfloat GainLF;
+        ALfloat LFReference;
     } Direct;
     struct {
-        ATOMIC(struct ALeffectslot*) Slot;
-        ATOMIC(ALfloat) Gain;
-        ATOMIC(ALfloat) GainHF;
-        ATOMIC(ALfloat) HFReference;
-        ATOMIC(ALfloat) GainLF;
-        ATOMIC(ALfloat) LFReference;
+        struct ALeffectslot *Slot;
+        ALfloat Gain;
+        ALfloat GainHF;
+        ALfloat HFReference;
+        ALfloat GainLF;
+        ALfloat LFReference;
     } Send[];
 };
 
diff --git a/OpenAL32/alAuxEffectSlot.c b/OpenAL32/alAuxEffectSlot.c
index e6b4ff68..37316549 100644
--- a/OpenAL32/alAuxEffectSlot.c
+++ b/OpenAL32/alAuxEffectSlot.c
@@ -530,8 +530,9 @@ ALenum InitializeEffect(ALCdevice *Device, ALeffectslot *EffectSlot, ALeffect *e
     props = ATOMIC_LOAD_SEQ(&EffectSlot->FreeList);
     while(props)
     {
-        State = ATOMIC_EXCHANGE(ALeffectState*, &props->State, NULL, almemory_order_relaxed);
-        if(State) ALeffectState_DecRef(State);
+        if(props->State)
+            ALeffectState_DecRef(props->State);
+        props->State = NULL;
         props = ATOMIC_LOAD(&props->next, almemory_order_relaxed);
     }
 
@@ -602,24 +603,20 @@ ALenum InitEffectSlot(ALeffectslot *slot)
 void DeinitEffectSlot(ALeffectslot *slot)
 {
     struct ALeffectslotProps *props;
-    ALeffectState *state;
     size_t count = 0;
 
     props = ATOMIC_LOAD_SEQ(&slot->Update);
     if(props)
     {
-        state = ATOMIC_LOAD(&props->State, almemory_order_relaxed);
-        if(state) ALeffectState_DecRef(state);
+        if(props->State) ALeffectState_DecRef(props->State);
         TRACE("Freed unapplied AuxiliaryEffectSlot update %p\n", props);
         al_free(props);
     }
     props = ATOMIC_LOAD(&slot->FreeList, almemory_order_relaxed);
     while(props)
     {
-        struct ALeffectslotProps *next;
-        state = ATOMIC_LOAD(&props->State, almemory_order_relaxed);
-        next = ATOMIC_LOAD(&props->next, almemory_order_relaxed);
-        if(state) ALeffectState_DecRef(state);
+        struct ALeffectslotProps *next = ATOMIC_LOAD(&props->next, almemory_order_relaxed);
+        if(props->State) ALeffectState_DecRef(props->State);
         al_free(props);
         props = next;
         ++count;
@@ -651,17 +648,17 @@ void UpdateEffectSlotProps(ALeffectslot *slot)
     }
 
     /* Copy in current property values. */
-    ATOMIC_STORE(&props->Gain, slot->Gain, almemory_order_relaxed);
-    ATOMIC_STORE(&props->AuxSendAuto, slot->AuxSendAuto, almemory_order_relaxed);
+    props->Gain = slot->Gain;
+    props->AuxSendAuto = slot->AuxSendAuto;
 
-    ATOMIC_STORE(&props->Type, slot->Effect.Type, almemory_order_relaxed);
+    props->Type = slot->Effect.Type;
     props->Props = slot->Effect.Props;
     /* Swap out any stale effect state object there may be in the container, to
      * delete it.
      */
     ALeffectState_IncRef(slot->Effect.State);
-    oldstate = ATOMIC_EXCHANGE(ALeffectState*, &props->State, slot->Effect.State,
-                               almemory_order_relaxed);
+    oldstate = props->State;
+    props->State = slot->Effect.State;
 
     /* Set the new container for updating internal parameters. */
     props = ATOMIC_EXCHANGE(struct ALeffectslotProps*, &slot->Update, props,
diff --git a/OpenAL32/alListener.c b/OpenAL32/alListener.c
index 9c237e99..e3d71435 100644
--- a/OpenAL32/alListener.c
+++ b/OpenAL32/alListener.c
@@ -474,30 +474,30 @@ void UpdateListenerProps(ALCcontext *context)
     }
 
     /* Copy in current property values. */
-    ATOMIC_STORE(&props->Position[0], listener->Position[0], almemory_order_relaxed);
-    ATOMIC_STORE(&props->Position[1], listener->Position[1], almemory_order_relaxed);
-    ATOMIC_STORE(&props->Position[2], listener->Position[2], almemory_order_relaxed);
-
-    ATOMIC_STORE(&props->Velocity[0], listener->Velocity[0], almemory_order_relaxed);
-    ATOMIC_STORE(&props->Velocity[1], listener->Velocity[1], almemory_order_relaxed);
-    ATOMIC_STORE(&props->Velocity[2], listener->Velocity[2], almemory_order_relaxed);
-
-    ATOMIC_STORE(&props->Forward[0], listener->Forward[0], almemory_order_relaxed);
-    ATOMIC_STORE(&props->Forward[1], listener->Forward[1], almemory_order_relaxed);
-    ATOMIC_STORE(&props->Forward[2], listener->Forward[2], almemory_order_relaxed);
-    ATOMIC_STORE(&props->Up[0], listener->Up[0], almemory_order_relaxed);
-    ATOMIC_STORE(&props->Up[1], listener->Up[1], almemory_order_relaxed);
-    ATOMIC_STORE(&props->Up[2], listener->Up[2], almemory_order_relaxed);
-
-    ATOMIC_STORE(&props->Gain, listener->Gain, almemory_order_relaxed);
-    ATOMIC_STORE(&props->MetersPerUnit, listener->MetersPerUnit, almemory_order_relaxed);
-
-    ATOMIC_STORE(&props->DopplerFactor, context->DopplerFactor, almemory_order_relaxed);
-    ATOMIC_STORE(&props->DopplerVelocity, context->DopplerVelocity, almemory_order_relaxed);
-    ATOMIC_STORE(&props->SpeedOfSound, context->SpeedOfSound, almemory_order_relaxed);
-
-    ATOMIC_STORE(&props->SourceDistanceModel, context->SourceDistanceModel, almemory_order_relaxed);
-    ATOMIC_STORE(&props->DistanceModel, context->DistanceModel, almemory_order_relaxed);
+    props->Position[0] = listener->Position[0];
+    props->Position[1] = listener->Position[1];
+    props->Position[2] = listener->Position[2];
+
+    props->Velocity[0] = listener->Velocity[0];
+    props->Velocity[1] = listener->Velocity[1];
+    props->Velocity[2] = listener->Velocity[2];
+
+    props->Forward[0] = listener->Forward[0];
+    props->Forward[1] = listener->Forward[1];
+    props->Forward[2] = listener->Forward[2];
+    props->Up[0] = listener->Up[0];
+    props->Up[1] = listener->Up[1];
+    props->Up[2] = listener->Up[2];
+
+    props->Gain = listener->Gain;
+    props->MetersPerUnit = listener->MetersPerUnit;
+
+    props->DopplerFactor = context->DopplerFactor;
+    props->DopplerVelocity = context->DopplerVelocity;
+    props->SpeedOfSound = context->SpeedOfSound;
+
+    props->SourceDistanceModel = context->SourceDistanceModel;
+    props->DistanceModel = context->DistanceModel;;
 
     /* Set the new container for updating internal parameters. */
     props = ATOMIC_EXCHANGE(struct ALlistenerProps*, &listener->Update, props, almemory_order_acq_rel);
diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c
index e81fd853..c4c0bfb1 100644
--- a/OpenAL32/alSource.c
+++ b/OpenAL32/alSource.c
@@ -2892,63 +2892,60 @@ static void UpdateSourceProps(ALsource *source, ALsizei num_sends)
     }
 
     /* Copy in current property values. */
-    ATOMIC_STORE(&props->Pitch, source->Pitch, almemory_order_relaxed);
-    ATOMIC_STORE(&props->Gain, source->Gain, almemory_order_relaxed);
-    ATOMIC_STORE(&props->OuterGain, source->OuterGain, almemory_order_relaxed);
-    ATOMIC_STORE(&props->MinGain, source->MinGain, almemory_order_relaxed);
-    ATOMIC_STORE(&props->MaxGain, source->MaxGain, almemory_order_relaxed);
-    ATOMIC_STORE(&props->InnerAngle, source->InnerAngle, almemory_order_relaxed);
-    ATOMIC_STORE(&props->OuterAngle, source->OuterAngle, almemory_order_relaxed);
-    ATOMIC_STORE(&props->RefDistance, source->RefDistance, almemory_order_relaxed);
-    ATOMIC_STORE(&props->MaxDistance, source->MaxDistance, almemory_order_relaxed);
-    ATOMIC_STORE(&props->RollOffFactor, source->RollOffFactor, almemory_order_relaxed);
+    props->Pitch = source->Pitch;
+    props->Gain = source->Gain;
+    props->OuterGain = source->OuterGain;
+    props->MinGain = source->MinGain;
+    props->MaxGain = source->MaxGain;
+    props->InnerAngle = source->InnerAngle;
+    props->OuterAngle = source->OuterAngle;
+    props->RefDistance = source->RefDistance;
+    props->MaxDistance = source->MaxDistance;
+    props->RollOffFactor = source->RollOffFactor;
     for(i = 0;i < 3;i++)
-        ATOMIC_STORE(&props->Position[i], source->Position[i], almemory_order_relaxed);
+        props->Position[i] = source->Position[i];
     for(i = 0;i < 3;i++)
-        ATOMIC_STORE(&props->Velocity[i], source->Velocity[i], almemory_order_relaxed);
+        props->Velocity[i] = source->Velocity[i];
     for(i = 0;i < 3;i++)
-        ATOMIC_STORE(&props->Direction[i], source->Direction[i], almemory_order_relaxed);
+        props->Direction[i] = source->Direction[i];
     for(i = 0;i < 2;i++)
     {
         ALsizei j;
         for(j = 0;j < 3;j++)
-            ATOMIC_STORE(&props->Orientation[i][j], source->Orientation[i][j],
-                         almemory_order_relaxed);
+            props->Orientation[i][j] = source->Orientation[i][j];
     }
-    ATOMIC_STORE(&props->HeadRelative, source->HeadRelative, almemory_order_relaxed);
-    ATOMIC_STORE(&props->DistanceModel, source->DistanceModel, almemory_order_relaxed);
-    ATOMIC_STORE(&props->DirectChannels, source->DirectChannels, almemory_order_relaxed);
+    props->HeadRelative = source->HeadRelative;
+    props->DistanceModel = source->DistanceModel;
+    props->DirectChannels = source->DirectChannels;
 
-    ATOMIC_STORE(&props->DryGainHFAuto, source->DryGainHFAuto, almemory_order_relaxed);
-    ATOMIC_STORE(&props->WetGainAuto, source->WetGainAuto, almemory_order_relaxed);
-    ATOMIC_STORE(&props->WetGainHFAuto, source->WetGainHFAuto, almemory_order_relaxed);
-    ATOMIC_STORE(&props->OuterGainHF, source->OuterGainHF, almemory_order_relaxed);
+    props->DryGainHFAuto = source->DryGainHFAuto;
+    props->WetGainAuto = source->WetGainAuto;
+    props->WetGainHFAuto = source->WetGainHFAuto;
+    props->OuterGainHF = source->OuterGainHF;
 
-    ATOMIC_STORE(&props->AirAbsorptionFactor, source->AirAbsorptionFactor, almemory_order_relaxed);
-    ATOMIC_STORE(&props->RoomRolloffFactor, source->RoomRolloffFactor, almemory_order_relaxed);
-    ATOMIC_STORE(&props->DopplerFactor, source->DopplerFactor, almemory_order_relaxed);
+    props->AirAbsorptionFactor = source->AirAbsorptionFactor;
+    props->RoomRolloffFactor = source->RoomRolloffFactor;
+    props->DopplerFactor = source->DopplerFactor;
 
-    ATOMIC_STORE(&props->StereoPan[0], source->StereoPan[0], almemory_order_relaxed);
-    ATOMIC_STORE(&props->StereoPan[1], source->StereoPan[1], almemory_order_relaxed);
+    props->StereoPan[0] = source->StereoPan[0];
+    props->StereoPan[1] = source->StereoPan[1];
 
-    ATOMIC_STORE(&props->Radius, source->Radius, almemory_order_relaxed);
+    props->Radius = source->Radius;
 
-    ATOMIC_STORE(&props->Direct.Gain, source->Direct.Gain, almemory_order_relaxed);
-    ATOMIC_STORE(&props->Direct.GainHF, source->Direct.GainHF, almemory_order_relaxed);
-    ATOMIC_STORE(&props->Direct.HFReference, source->Direct.HFReference, almemory_order_relaxed);
-    ATOMIC_STORE(&props->Direct.GainLF, source->Direct.GainLF, almemory_order_relaxed);
-    ATOMIC_STORE(&props->Direct.LFReference, source->Direct.LFReference, almemory_order_relaxed);
+    props->Direct.Gain = source->Direct.Gain;
+    props->Direct.GainHF = source->Direct.GainHF;
+    props->Direct.HFReference = source->Direct.HFReference;
+    props->Direct.GainLF = source->Direct.GainLF;
+    props->Direct.LFReference = source->Direct.LFReference;
 
     for(i = 0;i < num_sends;i++)
     {
-        ATOMIC_STORE(&props->Send[i].Slot, source->Send[i].Slot, almemory_order_relaxed);
-        ATOMIC_STORE(&props->Send[i].Gain, source->Send[i].Gain, almemory_order_relaxed);
-        ATOMIC_STORE(&props->Send[i].GainHF, source->Send[i].GainHF, almemory_order_relaxed);
-        ATOMIC_STORE(&props->Send[i].HFReference, source->Send[i].HFReference,
-                     almemory_order_relaxed);
-        ATOMIC_STORE(&props->Send[i].GainLF, source->Send[i].GainLF, almemory_order_relaxed);
-        ATOMIC_STORE(&props->Send[i].LFReference, source->Send[i].LFReference,
-                     almemory_order_relaxed);
+        props->Send[i].Slot = source->Send[i].Slot;
+        props->Send[i].Gain = source->Send[i].Gain;
+        props->Send[i].GainHF = source->Send[i].GainHF;
+        props->Send[i].HFReference = source->Send[i].HFReference;
+        props->Send[i].GainLF = source->Send[i].GainLF;
+        props->Send[i].LFReference = source->Send[i].LFReference;
     }
 
     /* Set the new container for updating internal parameters. */