sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A lot of fixes

Browse Source
This commit is contained in:
Jérôme Leclercq
2021-05-28 22:58:40 +02:00
parent ff505e9019
commit c2b61b6732
6 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Nazara/OpenGLRenderer/Wrapper/Context.cpp
View File

@@ -14,8 +14,6 @@
#include <stdexcept>
#include <Nazara/OpenGLRenderer/Debug.hpp>
#define NAZARA_OPENGLRENDERER_DEBUG 1
namespace Nz::GL
{
thread_local const Context* s_currentContext = nullptr;
@@ -469,7 +467,7 @@ namespace Nz::GL
{
if (m_state.renderStates.depthCompare != renderStates.depthCompare)
{
glDepthFunc(ToOpenGL(m_state.renderStates.depthCompare));
glDepthFunc(ToOpenGL(renderStates.depthCompare));
m_state.renderStates.depthCompare = renderStates.depthCompare;
}
@@ -516,12 +514,12 @@ namespace Nz::GL
if (currentStencilData.compare != newStencilData.compare ||
currentStencilData.reference != newStencilData.reference ||
currentStencilData.writeMask != newStencilData.writeMask)
currentStencilData.compareMask != newStencilData.compareMask)
{
glStencilFuncSeparate((front) ? GL_FRONT : GL_BACK, ToOpenGL(newStencilData.compare), newStencilData.reference, newStencilData.writeMask);
glStencilFuncSeparate((front) ? GL_FRONT : GL_BACK, ToOpenGL(newStencilData.compare), newStencilData.reference, newStencilData.compareMask);
currentStencilData.compare = newStencilData.compare;
currentStencilData.compareMask = newStencilData.compareMask;
currentStencilData.reference = newStencilData.reference;
currentStencilData.writeMask = newStencilData.writeMask;
}
if (currentStencilData.depthFail != newStencilData.depthFail ||
@@ -533,6 +531,12 @@ namespace Nz::GL
currentStencilData.fail = newStencilData.fail;
currentStencilData.pass = newStencilData.pass;
}
if (currentStencilData.writeMask != newStencilData.writeMask)
{
glStencilMaskSeparate((front) ? GL_FRONT : GL_BACK, newStencilData.writeMask);
currentStencilData.writeMask = newStencilData.writeMask;
}
};
ApplyStencilStates(true);