OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved the handling for paletted replacements into the texture manager.

Browse source 
This is something the texture should not concern itself with.
This commit is contained in:
Christoph Oelckers 2020-04-16 00:27:12 +02:00
commit da873ca8d1
4 changed files with 31 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/rendering/swrenderer/textures/r_swtexture.cpp
View file

@ -612,18 +612,10 @@ CUSTOM_CVAR(Bool, vid_nopalsubstitutions, false, CVAR_ARCHIVE | CVAR_NOINITCALL)
R_InitSkyMap();
}
static FGameTexture* PalCheck(FGameTexture* tex)
{
// In any true color mode this shouldn't do anything.
if (vid_nopalsubstitutions || V_IsTrueColor() || tex == nullptr) return tex;
auto palvers = tex->GetPalVersion();
if (palvers) return palvers;
return tex;
}
FSoftwareTexture* GetPalettedSWTexture(FTextureID texid, bool animate, FLevelLocals *checkcompat, bool allownull, bool frontsky)
{
auto tex = PalCheck(TexMan.GetGameTexture(texid, true));
bool needpal = !vid_nopalsubstitutions && !V_IsTrueColor();
auto tex = TexMan.GetPalettedTexture(texid, true, needpal);
if (tex == nullptr || (!allownull && !tex->isValid())) return nullptr;
if (frontsky)
{