OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- continued work on texture management.

Browse source
This commit is contained in:
Christoph Oelckers 2018-12-12 18:39:38 +01:00
commit c5447f0cdd
18 changed files with 79 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/hwrenderer/textures/hw_precache.cpp
View file

@ -177,13 +177,11 @@ void hw_PrecacheTexture(uint8_t *texhitlist, TMap<PClassActor*, bool> &actorhitl
{
if (!texhitlist[i])
{
auto mat = FMaterial::ValidateTexture(tex, false, false);
if (mat) mat->Clean(true);
tex->SystemTextures.Clean(true, false);
}
if (spritehitlist[i] == nullptr || (*spritehitlist[i]).CountUsed() == 0)
{
auto mat = FMaterial::ValidateTexture(tex, true, false);
if (mat) mat->Clean(true);
tex->SystemTextures.Clean(false, true);
}
}
}
@ -200,8 +198,7 @@ void hw_PrecacheTexture(uint8_t *texhitlist, TMap<PClassActor*, bool> &actorhitl
{
if (texhitlist[i] & (FTextureManager::HIT_Wall | FTextureManager::HIT_Flat | FTextureManager::HIT_Sky))
{
FMaterial * gltex = FMaterial::ValidateTexture(tex, false);
if (gltex && !screen->CheckPrecacheMaterial(gltex))
if (tex->GetImage() && tex->SystemTextures.GetHardwareTexture(0, false) == nullptr)
{
FImageSource::RegisterForPrecache(tex->GetImage());
}