zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 23:02:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed Vulkan's uTextureMode setup. Also only mask out the flags we really do not want to avoid surprises in the future.

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-13 08:54:45 +02:00
parent 9ef6d8fd53
commit 3a47c5c7f7
2 changed files with 2 additions and 2 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

@ -128,7 +128,7 @@ bool FGLRenderState::ApplyShader()
activeShader->muFogEnabled.Set(fogset); activeShader->muFogEnabled.Set(fogset);
int f = mTextureModeFlags; int f = mTextureModeFlags;
if (!mBrightmapEnabled) f &= TEXF_Detailmap; if (!mBrightmapEnabled) f &= ~(TEXF_Brightmap | TEXF_Glowmap);
activeShader->muTextureMode.Set((mTextureMode == TM_NORMAL && mTempTM == TM_OPAQUE ? TM_OPAQUE : mTextureMode) | f); activeShader->muTextureMode.Set((mTextureMode == TM_NORMAL && mTempTM == TM_OPAQUE ? TM_OPAQUE : mTextureMode) | f);
activeShader->muLightParms.Set(mLightParms); activeShader->muLightParms.Set(mLightParms);
activeShader->muFogColor.Set(mStreamData.uFogColor); activeShader->muFogColor.Set(mStreamData.uFogColor);

2
src/rendering/vulkan/renderer/vk_renderstate.cpp
View file

@ -374,7 +374,7 @@ void VkRenderState::ApplyPushConstants()
mPushConstants.uFogEnabled = fogset; mPushConstants.uFogEnabled = fogset;
int f = mTextureModeFlags; int f = mTextureModeFlags;
if (!mBrightmapEnabled) if (!mBrightmapEnabled) f &= ~(TEXF_Brightmap|TEXF_Glowmap);
mPushConstants.uTextureMode = (mTextureMode == TM_NORMAL && tempTM == TM_OPAQUE ? TM_OPAQUE : mTextureMode) | f; mPushConstants.uTextureMode = (mTextureMode == TM_NORMAL && tempTM == TM_OPAQUE ? TM_OPAQUE : mTextureMode) | f;
mPushConstants.uLightDist = mLightParms[0]; mPushConstants.uLightDist = mLightParms[0];
mPushConstants.uLightFactor = mLightParms[1]; mPushConstants.uLightFactor = mLightParms[1];