zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-11 15:22:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed two of the state flags in SetStencil and handle them explicitly.

Browse source
This commit is contained in:
Christoph Oelckers 2018-10-29 09:53:07 +01:00
parent 163d6be0d7
commit 1bbc9f6730
5 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -441,12 +441,6 @@ void FGLRenderState::SetStencil(int offs, int op, int flags)
bool cmon = !(flags & SF_ColorMaskOff); bool cmon = !(flags & SF_ColorMaskOff);
glColorMask(cmon, cmon, cmon, cmon); // don't write to the graphics buffer glColorMask(cmon, cmon, cmon, cmon); // don't write to the graphics buffer
glDepthMask(!(flags & SF_DepthMaskOff)); glDepthMask(!(flags & SF_DepthMaskOff));
if (flags & SF_DepthTestOff)
glDisable(GL_DEPTH_TEST);
else
glEnable(GL_DEPTH_TEST);
if (flags & SF_DepthClear)
glClear(GL_DEPTH_BUFFER_BIT);
} }
void FGLRenderState::SetCulling(int mode) void FGLRenderState::SetCulling(int mode)

1
src/gl/renderer/gl_renderstate.h
View file

@ -99,7 +99,6 @@ public:
void Apply(); void Apply();
void ApplyBuffers(); void ApplyBuffers();
void ApplyLightIndex(int index);
void ApplyBlendMode(); void ApplyBlendMode();
void ResetVertexBuffer() void ResetVertexBuffer()

2
src/hwrenderer/scene/hw_drawinfo.h
View file

@ -39,8 +39,6 @@ enum EStencilFlags
SF_AllOn = 0, SF_AllOn = 0,
SF_ColorMaskOff = 1, SF_ColorMaskOff = 1,
SF_DepthMaskOff = 2, SF_DepthMaskOff = 2,
SF_DepthTestOff = 4,
SF_DepthClear = 8
}; };
enum EStencilOp enum EStencilOp

6
src/hwrenderer/scene/hw_flats.cpp
View file

@ -255,17 +255,19 @@ void GLFlat::DrawSubsectors(HWDrawInfo *di, FRenderState &state)
// Draw projected plane into stencil // Draw projected plane into stencil
state.EnableTexture(true); state.EnableTexture(true);
state.SetEffect(EFF_NONE); state.SetEffect(EFF_NONE);
state.SetStencil(1, SOP_Keep, SF_DepthMaskOff | SF_DepthTestOff); state.SetStencil(1, SOP_Keep, SF_DepthMaskOff);
state.EnableDepthTest(false);
state.Draw(DT_TriangleFan,fnode->vertexindex + 4, 4); state.Draw(DT_TriangleFan,fnode->vertexindex + 4, 4);
// clear stencil // clear stencil
state.SetEffect(EFF_STENCIL); state.SetEffect(EFF_STENCIL);
state.EnableTexture(false); state.EnableTexture(false);
state.SetStencil(1, SOP_Decrement, SF_ColorMaskOff | SF_DepthMaskOff | SF_DepthTestOff); state.SetStencil(1, SOP_Decrement, SF_ColorMaskOff | SF_DepthMaskOff);
state.Draw(DT_TriangleFan,fnode->vertexindex, 4); state.Draw(DT_TriangleFan,fnode->vertexindex, 4);
// restore old stencil op. // restore old stencil op.
state.EnableTexture(true); state.EnableTexture(true);
state.EnableDepthTest(true);
state.SetEffect(EFF_NONE); state.SetEffect(EFF_NONE);
state.SetDepthBias(0, 0); state.SetDepthBias(0, 0);
state.SetStencil(0, SOP_Keep, SF_AllOn); state.SetStencil(0, SOP_Keep, SF_AllOn);

10
src/hwrenderer/scene/hw_portal.cpp
View file

@ -238,7 +238,8 @@ void HWPortal::SetupStencil(HWDrawInfo *di, FRenderState &state, bool usestencil
state.SetDepthFunc(DF_Less); state.SetDepthFunc(DF_Less);
DrawPortalStencil(state, STP_AllInOne); DrawPortalStencil(state, STP_AllInOne);
state.SetStencil(1, SOP_Keep, SF_DepthTestOff | SF_DepthMaskOff); state.SetStencil(1, SOP_Keep, SF_DepthMaskOff);
state.EnableDepthTest(false);
state.EnableTexture(true); state.EnableTexture(true);
state.SetEffect(EFF_NONE); state.SetEffect(EFF_NONE);
} }
@ -249,7 +250,8 @@ void HWPortal::SetupStencil(HWDrawInfo *di, FRenderState &state, bool usestencil
{ {
if (!NeedDepthBuffer()) if (!NeedDepthBuffer())
{ {
state.SetStencil(0, SOP_Keep, SF_DepthTestOff | SF_DepthMaskOff); state.SetStencil(0, SOP_Keep, SF_DepthMaskOff);
state.EnableDepthTest(false);
} }
} }
@ -266,6 +268,7 @@ void HWPortal::RemoveStencil(HWDrawInfo *di, FRenderState &state, bool usestenci
auto &vp = di->Viewpoint; auto &vp = di->Viewpoint;
if (vp.camera != nullptr) vp.camera->renderflags = (vp.camera->renderflags & ~RF_MAYBEINVISIBLE) | savedvisibility; if (vp.camera != nullptr) vp.camera->renderflags = (vp.camera->renderflags & ~RF_MAYBEINVISIBLE) | savedvisibility;
state.EnableDepthTest(true);
if (usestencil) if (usestencil)
{ {
state.SetEffect(EFF_NONE); state.SetEffect(EFF_NONE);
@ -298,7 +301,8 @@ void HWPortal::RemoveStencil(HWDrawInfo *di, FRenderState &state, bool usestenci
state.EnableTexture(false); state.EnableTexture(false);
state.SetRenderStyle(STYLE_Source); state.SetRenderStyle(STYLE_Source);
state.SetStencil(0, SOP_Keep, needdepth ? SF_ColorMaskOff | SF_DepthClear : SF_ColorMaskOff); state.SetStencil(0, SOP_Keep, SF_ColorMaskOff);
if (needdepth) state.Clear(CT_Depth);
state.SetDepthRange(0, 1); state.SetDepthRange(0, 1);
state.SetDepthFunc(DF_LEqual); state.SetDepthFunc(DF_LEqual);
DrawPortalStencil(state, STP_DepthRestore); DrawPortalStencil(state, STP_DepthRestore);