OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- decoupled the software renderer entirely from FTexture - it will only look at FSoftwareTexture now, all access to the texture manager has been wrapped.

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-14 00:42:13 +02:00
commit 9593cb56ae
23 changed files with 170 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/rendering/swrenderer/r_swrenderer.cpp
View file

@ -82,13 +82,13 @@ FRenderer *CreateSWRenderer()
return new FSoftwareRenderer;
}
void FSoftwareRenderer::PreparePrecache(FTexture *ttex, int cache)
void FSoftwareRenderer::PreparePrecache(FGameTexture *ttex, int cache)
{
bool isbgra = V_IsTrueColor();
if (ttex != nullptr && ttex->isValid() && !ttex->isCanvas())
if (ttex != nullptr && ttex->isValid() && !ttex->GetTexture()->isCanvas())
{
FSoftwareTexture *tex = ttex->GetSoftwareTexture();
FSoftwareTexture *tex = GetSoftwareTexture(ttex);
if (tex->CheckPixels())
{
@ -96,18 +96,18 @@ void FSoftwareRenderer::PreparePrecache(FTexture *ttex, int cache)
}
else if (cache != 0)
{
FImageSource::RegisterForPrecache(ttex->GetImage(), V_IsTrueColor());
FImageSource::RegisterForPrecache(ttex->GetTexture()->GetImage(), V_IsTrueColor());
}
}
}
void FSoftwareRenderer::PrecacheTexture(FTexture *ttex, int cache)
void FSoftwareRenderer::PrecacheTexture(FGameTexture *ttex, int cache)
{
bool isbgra = V_IsTrueColor();
if (ttex != nullptr && ttex->isValid() && !ttex->isCanvas())
if (ttex != nullptr && ttex->isValid() && !ttex->GetTexture()->isCanvas())
{
FSoftwareTexture *tex = ttex->GetSoftwareTexture();
FSoftwareTexture *tex = GetSoftwareTexture(ttex);
if (cache & FTextureManager::HIT_Columnmode)
{
const FSoftwareTextureSpan *spanp;
@ -173,12 +173,12 @@ void FSoftwareRenderer::Precache(uint8_t *texhitlist, TMap<PClassActor*, bool> &
FImageSource::BeginPrecaching();
for (int i = cnt - 1; i >= 0; i--)
{
PreparePrecache(TexMan.ByIndex(i), texhitlist[i]);
PreparePrecache(TexMan.GameByIndex(i), texhitlist[i]);
}
for (int i = cnt - 1; i >= 0; i--)
{
PrecacheTexture(TexMan.ByIndex(i), texhitlist[i]);
PrecacheTexture(TexMan.GameByIndex(i), texhitlist[i]);
}
FImageSource::EndPrecaching();
}