OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

allow omitting "material" for globalshader in gldefs

Browse source
This commit is contained in:
Ricardo Luís Vaz Silva 2025-01-08 09:54:26 -03:00 • committed by Nash Muhandes
commit 1845de1428
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/r_data/gldefs.cpp
View file

@ -351,6 +351,7 @@ static const char *CoreKeywords[]=
"material",
"lightsizefactor",
"colorization",
"globalshader",
nullptr
};
@ -376,6 +377,7 @@ enum
TAG_MATERIAL,
TAG_LIGHTSIZEFACTOR,
TAG_COLORIZATION,
TAG_GLOBALSHADER,
};
//==========================================================================
@ -1397,7 +1399,7 @@ class GLDefsParser
//
//==========================================================================
void ParseMaterial()
void ParseMaterial(bool is_globalshader = false)
{
ETextureType type = ETextureType::Any;
bool disable_fullbright = false;
@ -1409,7 +1411,6 @@ class GLDefsParser
bool hasUniforms = false;
TMap<FString, UserUniformValue> Uniforms;
bool is_globalshader = false;
TArray<int> globaltargets;
FString str_globaltargets;
@ -1426,12 +1427,13 @@ class GLDefsParser
FGameTexture* tex = nullptr;
sc.MustGetString();
if(sc.Compare("globalshader"))
if(is_globalshader || sc.Compare("globalshader"))
{
is_globalshader = true;
usershader.shaderFlags |= SFlag_Global; // make sure global usershader objects aren't reused for material shaders
sc.MustGetString();
if(!is_globalshader) sc.MustGetString();
is_globalshader = true;
if (sc.Compare("all"))
{
@ -2654,7 +2656,10 @@ public:
ParseBrightmap();
break;
case TAG_MATERIAL:
ParseMaterial();
ParseMaterial(false);
break;
case TAG_GLOBALSHADER:
ParseMaterial(true);
break;
case TAG_HARDWARESHADER:
ParseHardwareShader();