OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- some reorganization of portal code.

Browse source
This commit is contained in:
Christoph Oelckers 2018-10-23 22:32:00 +02:00
commit 93dac4e4d8
12 changed files with 149 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/gl/renderer/gl_renderstate.cpp
View file

@ -38,8 +38,6 @@
#include "gl/renderer/gl_renderbuffers.h"
#include "gl/textures/gl_hwtexture.h"
static int op2gl[] = { GL_KEEP, GL_INCR, GL_DECR };
FGLRenderState gl_RenderState;
static VSMatrix identityMatrix(1);
@ -60,9 +58,6 @@ static void matrixToGL(const VSMatrix &mat, int loc)
void FGLRenderState::Reset()
{
FRenderState::Reset();
mSrcBlend = GL_SRC_ALPHA;
mDstBlend = GL_ONE_MINUS_SRC_ALPHA;
mBlendEquation = GL_FUNC_ADD;
mVertexBuffer = mCurrentVertexBuffer = nullptr;
mGlossiness = 0.0f;
mSpecularLevel = 0.0f;
@ -238,22 +233,6 @@ void FGLRenderState::Apply()
mMaterial.mChanged = false;
}
if (mStencil.mChanged)
{
glStencilFunc(GL_EQUAL, mStencil.mBaseVal + mStencil.mOffsVal, ~0); // draw sky into stencil
glStencilOp(GL_KEEP, GL_KEEP, op2gl[mStencil.mOperation]); // this stage doesn't modify the stencil
bool cmon = !(mStencil.mFlags & SF_ColorMaskOff);
glColorMask(cmon, cmon, cmon, cmon); // don't write to the graphics buffer
glDepthMask(!(mStencil.mFlags & SF_DepthMaskOff));
if (mStencil.mFlags & SF_DepthTestOff)
glDisable(GL_DEPTH_TEST);
else
glEnable(GL_DEPTH_TEST);
mStencil.mChanged = false;
}
if (mBias.mChanged)
{
if (mBias.mFactor == 0 && mBias.mUnits == 0)