OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Remove dead code in FMaterial

Browse source 
not called anywhere
This commit is contained in:
Ricardo Luís Vaz Silva 2025-01-09 23:01:16 -03:00 • committed by Magnus Norddahl
commit 102a189525
2 changed files with 4 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/common/textures/hw_material.cpp
View file

@ -32,15 +32,8 @@
CVAR(Bool, gl_customshader, true, 0);
static IHardwareTexture* (*layercallback)(int layer, int translation);
TArray<UserShaderDesc> usershaders;
void FMaterial::SetLayerCallback(IHardwareTexture* (*cb)(int layer, int translation))
{
layercallback = cb;
}
//===========================================================================
//
// Constructor
@ -191,23 +184,10 @@ FMaterial::~FMaterial()
IHardwareTexture* FMaterial::GetLayer(int i, int translation, MaterialLayerInfo** pLayer) const
{
if ((mScaleFlags & CTF_Indexed) && i > 0 && layercallback)
{
static MaterialLayerInfo deflayer = { nullptr, 0, CLAMP_XY };
if (i == 1 || i == 2)
{
if (pLayer) *pLayer = &deflayer;
//This must be done with a user supplied callback because we cannot set up the rules for palette data selection here
return layercallback(i, translation);
}
}
else
{
auto& layer = mTextureLayers[i];
if (pLayer) *pLayer = &layer;
if (mScaleFlags & CTF_Indexed) translation = -1;
if (layer.layerTexture) return layer.layerTexture->GetHardwareTexture(translation, layer.scaleFlags);
}
auto& layer = mTextureLayers[i];
if (pLayer) *pLayer = &layer;
if (mScaleFlags & CTF_Indexed) translation = -1;
if (layer.layerTexture) return layer.layerTexture->GetHardwareTexture(translation, layer.scaleFlags);
return nullptr;
}

1
src/common/textures/hw_material.h
View file

@ -31,7 +31,6 @@ class FMaterial
int mScaleFlags;
public:
static void SetLayerCallback(IHardwareTexture* (*layercallback)(int layer, int translation));
FGameTexture *sourcetex; // the owning texture.