OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

cache FName conversion for GetGlobalShader

Browse source
This commit is contained in:
Ricardo Luís Vaz Silva 2025-05-12 18:27:25 -03:00 • committed by Magnus Norddahl
commit f522296970
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/g_level.cpp
View file

@ -1386,6 +1386,7 @@ void G_DoLoadLevel(const FString &nextmapname, int position, bool autosave, bool
void FLevelLocals::DoLoadLevel(const FString &nextmapname, int position, bool autosave, bool newGame)
{
MapName = nextmapname;
MapFName = MapName;
int i;
if (NextSkill >= 0)

1
src/g_levellocals.h
View file

@ -540,6 +540,7 @@ public:
int lumpnum;
FString LevelName;
FString MapName; // the lump name (E1M1, MAP01, etc)
FName MapFName; // cache name index for lump
FString NextMap; // go here when using the regular exit
FString NextSecretMap; // map to go to when used secret exit
FString AuthorName;

7
src/r_data/gldefs.cpp
View file

@ -92,11 +92,10 @@ const GlobalShaderDesc * GetGlobalShader(int shaderNum, PClass * curActor, Globa
}
}
FName MapName = level.MapName;
shader = mapshaders[shaderNum].CheckKey(MapName);
shader = mapshaders[shaderNum].CheckKey(level.MapFName);
if(shader && shader->shaderindex > 0)
{
addr = {int16_t(shaderNum), 1, MapName.GetIndex()};
addr = {int16_t(shaderNum), 1, level.MapFName.GetIndex()};
return shader;
}
@ -127,7 +126,7 @@ const GlobalShaderDesc * GetGlobalShader(int shaderNum, PClass * curActor)
const GlobalShaderDesc * GetGlobalShader(GlobalShaderAddr index)
{
if(index.num > NUM_BUILTIN_SHADERS || index.type > 2) return &nullglobalshader;
if(index.num >= NUM_BUILTIN_SHADERS || index.type > 2) return &nullglobalshader;
if(index.type == 0) return &globalshaders[index.num];