zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-29 16:31:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'remotes/origin/master' into back_to_basics2

Browse source
This commit is contained in:
Christoph Oelckers 2020-07-05 11:55:41 +02:00
commit 8a1206edbc
24 changed files with 163 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

4
source/glbackend/glbackend.cpp
View file

@ -49,6 +49,8 @@
#include "hw_renderstate.h"
#include "hw_cvars.h"
CVAR(Bool, gl_texture, true, 0)
F2DDrawer twodpsp;
static int BufferLock = 0;
@ -166,7 +168,7 @@ void PolymostRenderState::Apply(FRenderState& state, GLState& oldState)
}
else
{
state.EnableTexture(true);
state.EnableTexture(gl_texture);
state.SetMaterial(mMaterial.mMaterial, mMaterial.mClampMode, mMaterial.mTranslation, mMaterial.mOverrideShader);
}
/* todo: bind indexed textures */