zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-25 13:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed a few things that slipped through

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-19 12:40:30 +02:00
parent b2281c38e1
commit d4cc217d42
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/rendering/gl/renderer/gl_renderstate.cpp
View file

@ -325,7 +325,7 @@ void FGLRenderState::ApplyMaterial(FMaterial *mat, int clampmode, int translatio
int numLayers = mat->NumLayers(); int numLayers = mat->NumLayers();
MaterialLayerInfo* layer; MaterialLayerInfo* layer;
auto base = static_cast<FHardwareTexture*>(mat->GetLayer(0, translation)); auto base = static_cast<FHardwareTexture*>(mat->GetLayer(0, translation, &layer));
if (base->BindOrCreate(tex->GetTexture(), 0, clampmode, translation, layer->scaleFlags)) if (base->BindOrCreate(tex->GetTexture(), 0, clampmode, translation, layer->scaleFlags))
{ {

4
src/rendering/hwrenderer/textures/hw_precache.cpp
View file

@ -97,7 +97,7 @@ void hw_PrecacheTexture(uint8_t *texhitlist, TMap<PClassActor*, bool> &actorhitl
TArray<FTexture*> layers; TArray<FTexture*> layers;
// First collect the potential max. texture set // First collect the potential max. texture set
for (unsigned i = 1; i < TexMan.NumTextures(); i++) for (int i = 1; i < TexMan.NumTextures(); i++)
{ {
auto gametex = TexMan.GameByIndex(i); auto gametex = TexMan.GameByIndex(i);
if (gametex && if (gametex &&
@ -258,7 +258,7 @@ void hw_PrecacheTexture(uint8_t *texhitlist, TMap<PClassActor*, bool> &actorhitl
// delete unused hardware textures (i.e. those which didn't get referenced by any material in the cache list.) // delete unused hardware textures (i.e. those which didn't get referenced by any material in the cache list.)
decltype(allTextures)::Iterator ita(allTextures); decltype(allTextures)::Iterator ita(allTextures);
decltype(allTextures)::Pair* paira; decltype(allTextures)::Pair* paira;
while (it.NextPair(pair)) while (ita.NextPair(paira))
{ {
paira->Key->CleanUnused(); paira->Key->CleanUnused();
} }