OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into lightmaps2

Browse source
This commit is contained in:
Magnus Norddahl 2021-10-21 23:08:55 +02:00
commit f216ca4ea8
279 changed files with 25020 additions and 10424 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/common/rendering/gl/gl_shader.cpp
View file

@ -49,6 +49,8 @@
#include <map>
#include <memory>
EXTERN_CVAR(Bool, r_skipmats)
namespace OpenGLRenderer
{
@ -733,6 +735,9 @@ FShader *FShaderManager::BindEffect(int effect, EPassType passType)
FShader *FShaderManager::Get(unsigned int eff, bool alphateston, EPassType passType)
{
if (r_skipmats && eff >= 3 && eff <= 4)
eff = 0;
if (passType < mPassShaders.Size())
return mPassShaders[passType]->Get(eff, alphateston);
else