zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 07:12:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- add thread safety to GetSpecialLights

Browse source
This commit is contained in:
Magnus Norddahl 2017-03-16 17:53:12 +01:00
parent b529b1e3a7
commit f1b03b48e9
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/swrenderer/r_swcolormaps.cpp
View file

@ -70,12 +70,16 @@ TArray<FSWColormap> SpecialSWColormaps;
// //
//========================================================================== //==========================================================================
FDynamicColormap *GetSpecialLights (PalEntry color, PalEntry fade, int desaturate) static FDynamicColormap *CreateSpecialLights (PalEntry color, PalEntry fade, int desaturate)
{ {
FDynamicColormap *colormap; // GetSpecialLights is called by the scene worker threads.
// If we didn't find the colormap, search again, but this time one thread at a time
static std::mutex buildmapmutex;
std::unique_lock<std::mutex> lock(buildmapmutex);
// If this colormap has already been created, just return it // If this colormap has already been created, just return it
for (colormap = &NormalLight; colormap != NULL; colormap = colormap->Next) // This may happen if another thread beat us to it
for (FDynamicColormap *colormap = &NormalLight; colormap != NULL; colormap = colormap->Next)
{ {
if (color == colormap->Color && if (color == colormap->Color &&
fade == colormap->Fade && fade == colormap->Fade &&
@ -86,7 +90,7 @@ FDynamicColormap *GetSpecialLights (PalEntry color, PalEntry fade, int desaturat
} }
// Not found. Create it. // Not found. Create it.
colormap = new FDynamicColormap; FDynamicColormap *colormap = new FDynamicColormap;
colormap->Next = NormalLight.Next; colormap->Next = NormalLight.Next;
colormap->Color = color; colormap->Color = color;
colormap->Fade = fade; colormap->Fade = fade;
@ -98,6 +102,22 @@ FDynamicColormap *GetSpecialLights (PalEntry color, PalEntry fade, int desaturat
return colormap; return colormap;
} }
FDynamicColormap *GetSpecialLights (PalEntry color, PalEntry fade, int desaturate)
{
// If this colormap has already been created, just return it
for (FDynamicColormap *colormap = &NormalLight; colormap != NULL; colormap = colormap->Next)
{
if (color == colormap->Color &&
fade == colormap->Fade &&
desaturate == colormap->Desaturate)
{
return colormap;
}
}
return CreateSpecialLights(color, fade, desaturate);
}
//========================================================================== //==========================================================================
// //
// Free all lights created with GetSpecialLights // Free all lights created with GetSpecialLights