From 3a47c5c7f773b43dc33cb2c23b440cbc70f7c60c Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 13 Apr 2020 08:54:45 +0200 Subject: [PATCH] - fixed Vulkan's uTextureMode setup. Also only mask out the flags we really do not want to avoid surprises in the future. --- src/rendering/gl/renderer/gl_renderstate.cpp | 2 +- src/rendering/vulkan/renderer/vk_renderstate.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rendering/gl/renderer/gl_renderstate.cpp b/src/rendering/gl/renderer/gl_renderstate.cpp index 8bb637ca4..4eb25647b 100644 --- a/src/rendering/gl/renderer/gl_renderstate.cpp +++ b/src/rendering/gl/renderer/gl_renderstate.cpp @@ -128,7 +128,7 @@ bool FGLRenderState::ApplyShader() activeShader->muFogEnabled.Set(fogset); 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->muLightParms.Set(mLightParms); activeShader->muFogColor.Set(mStreamData.uFogColor); diff --git a/src/rendering/vulkan/renderer/vk_renderstate.cpp b/src/rendering/vulkan/renderer/vk_renderstate.cpp index f5cc42e76..ca08b4134 100644 --- a/src/rendering/vulkan/renderer/vk_renderstate.cpp +++ b/src/rendering/vulkan/renderer/vk_renderstate.cpp @@ -374,7 +374,7 @@ void VkRenderState::ApplyPushConstants() mPushConstants.uFogEnabled = fogset; 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.uLightDist = mLightParms[0]; mPushConstants.uLightFactor = mLightParms[1];