zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-18 10:11:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove mAlphaThreshold

Browse source
This commit is contained in:
Magnus Norddahl 2023-04-24 22:50:04 +02:00 committed by Christoph Oelckers
parent 5de7c1ee03
commit 367c1f8aaa
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/common/rendering/hwrenderer/data/hw_renderstate.h
View file

@ -236,9 +236,6 @@ protected:
int mSoftLight; int mSoftLight;
int mLightMode = -1; int mLightMode = -1;
float mAlphaThreshold;
int mColorMapSpecial; int mColorMapSpecial;
float mColorMapFlash; float mColorMapFlash;
@ -274,7 +271,7 @@ public:
mTextureClamp = 0; mTextureClamp = 0;
mTextureModeFlags = 0; mTextureModeFlags = 0;
mStreamData.uDesaturationFactor = 0.0f; mStreamData.uDesaturationFactor = 0.0f;
mAlphaThreshold = 0.5f; mStreamData.uAlphaThreshold = 0.5f;
mModelMatrixEnabled = false; mModelMatrixEnabled = false;
mTextureMatrixEnabled = false; mTextureMatrixEnabled = false;
mSplitEnabled = false; mSplitEnabled = false;
@ -578,8 +575,8 @@ public:
void AlphaFunc(int func, float thresh) void AlphaFunc(int func, float thresh)
{ {
if (func == Alpha_Greater) mAlphaThreshold = thresh; if (func == Alpha_Greater) mStreamData.uAlphaThreshold = thresh;
else mAlphaThreshold = thresh - 0.001f; else mStreamData.uAlphaThreshold = thresh - 0.001f;
} }
void SetLightIndex(int index) void SetLightIndex(int index)

4
src/common/rendering/vulkan/vk_renderstate.cpp
View file

@ -244,7 +244,7 @@ void VkRenderState::ApplyRenderPass(int dt)
pipelineKey.ShaderKey.EffectState = mTextureEnabled ? effectState : SHADER_NoTexture; pipelineKey.ShaderKey.EffectState = mTextureEnabled ? effectState : SHADER_NoTexture;
if (r_skipmats && pipelineKey.ShaderKey.EffectState >= 3 && pipelineKey.ShaderKey.EffectState <= 4) if (r_skipmats && pipelineKey.ShaderKey.EffectState >= 3 && pipelineKey.ShaderKey.EffectState <= 4)
pipelineKey.ShaderKey.EffectState = 0; pipelineKey.ShaderKey.EffectState = 0;
pipelineKey.ShaderKey.AlphaTest = mAlphaThreshold >= 0.f; pipelineKey.ShaderKey.AlphaTest = mStreamData.uAlphaThreshold >= 0.f;
} }
int uTextureMode = GetTextureModeAndFlags((mMaterial.mMaterial && mMaterial.mMaterial->Source()->isHardwareCanvas()) ? TM_OPAQUE : TM_NORMAL); int uTextureMode = GetTextureModeAndFlags((mMaterial.mMaterial && mMaterial.mMaterial->Source()->isHardwareCanvas()) ? TM_OPAQUE : TM_NORMAL);
@ -395,8 +395,6 @@ void VkRenderState::ApplyStreamData()
else else
mStreamData.timer = 0.0f; mStreamData.timer = 0.0f;
mStreamData.uAlphaThreshold = mAlphaThreshold;
if (mMaterial.mMaterial) if (mMaterial.mMaterial)
{ {
auto source = mMaterial.mMaterial->Source(); auto source = mMaterial.mMaterial->Source();