diff --git a/include/RaZ/Render/Renderer.hpp b/include/RaZ/Render/Renderer.hpp index 0e0de26d..009e72c8 100644 --- a/include/RaZ/Render/Renderer.hpp +++ b/include/RaZ/Render/Renderer.hpp @@ -409,18 +409,18 @@ enum class TextureInternalFormat : unsigned int { RGB16_SNORM = 36762 /* GL_RGB16_SNORM */, ///< RGBA16_SNORM = 36763 /* GL_RGBA16_SNORM */, ///< - R32I = 33333 /* GL_R32I */, ///< - RG32I = 33339 /* GL_RG32I */, ///< - RGB32I = 36227 /* GL_RGB32I */, ///< - RGBA32I = 36226 /* GL_RGBA32I */, ///< - R32UI = 33334 /* GL_R32UI */, ///< - RG32UI = 33340 /* GL_RG32UI */, ///< - RGB32UI = 36209 /* GL_RGB32UI */, ///< - RGBA32UI = 36208 /* GL_RGBA32UI */, ///< - R32F = 33326 /* GL_R32F */, ///< - RG32F = 33328 /* GL_RG32F */, ///< - RGB32F = 34837 /* GL_RGB32F */, ///< - RGBA32F = 34836 /* GL_RGBA32F */, ///< + R32I = 33333 /* GL_R32I */, ///< + RG32I = 33339 /* GL_RG32I */, ///< + RGB32I = 36227 /* GL_RGB32I */, ///< + RGBA32I = 36226 /* GL_RGBA32I */, ///< + R32UI = 33334 /* GL_R32UI */, ///< + RG32UI = 33340 /* GL_RG32UI */, ///< + RGB32UI = 36209 /* GL_RGB32UI */, ///< + RGBA32UI = 36208 /* GL_RGBA32UI */, ///< + R32F = 33326 /* GL_R32F */, ///< + RG32F = 33328 /* GL_RG32F */, ///< + RGB32F = 34837 /* GL_RGB32F */, ///< + RGBA32F = 34836 /* GL_RGBA32F */, ///< RGB10_A2 = 32857 /* GL_RGB10_A2 */, ///< RGB10_A2UI = 36975 /* GL_RGB10_A2UI */, ///< diff --git a/src/RaZ/Render/Cubemap.cpp b/src/RaZ/Render/Cubemap.cpp index b594c4c0..f6e54bd8 100644 --- a/src/RaZ/Render/Cubemap.cpp +++ b/src/RaZ/Render/Cubemap.cpp @@ -243,17 +243,14 @@ void Cubemap::draw() const { ZoneScopedN("Cubemap::draw"); TracyGpuZone("Cubemap::draw") - Renderer::setDepthFunction(DepthStencilFunction::LESS_EQUAL); - const MeshRenderer& displayCube = getDisplayCube(); displayCube.getMaterials().front().getProgram().use(); - Renderer::activateTexture(0); bind(); + Renderer::setDepthFunction(DepthStencilFunction::LESS_EQUAL); displayCube.draw(); - Renderer::setDepthFunction(DepthStencilFunction::LESS); } diff --git a/src/RaZ/Render/RenderSystem.cpp b/src/RaZ/Render/RenderSystem.cpp index c9391563..429a8661 100644 --- a/src/RaZ/Render/RenderSystem.cpp +++ b/src/RaZ/Render/RenderSystem.cpp @@ -397,7 +397,10 @@ void RenderSystem::copyToWindow(const Texture2D& colorBuffer, const Texture2D& d Renderer::bindFramebuffer(0); Renderer::clear(MaskType::COLOR | MaskType::DEPTH | MaskType::STENCIL); + + Renderer::setDepthFunction(DepthStencilFunction::ALWAYS); windowCopyPass.execute(); + Renderer::setDepthFunction(DepthStencilFunction::LESS); } } // namespace Raz diff --git a/src/RaZ/XR/XrSession.cpp b/src/RaZ/XR/XrSession.cpp index 1a08e79e..f8798951 100644 --- a/src/RaZ/XR/XrSession.cpp +++ b/src/RaZ/XR/XrSession.cpp @@ -515,10 +515,11 @@ void XrSession::copyToSwapchains(const Texture2D& colorBuffer, const Texture2D& Renderer::bindFramebuffer(m_swapchainCopyPass.getFramebuffer().getIndex(), FramebufferType::DRAW_FRAMEBUFFER); Renderer::setFramebufferTexture2D(FramebufferAttachment::COLOR0, colorSwapchainImage, 0); Renderer::setFramebufferTexture2D(FramebufferAttachment::DEPTH, depthSwapchainImage, 0); - Renderer::clear(MaskType::COLOR | MaskType::DEPTH | MaskType::STENCIL); + Renderer::setDepthFunction(DepthStencilFunction::ALWAYS); m_swapchainCopyPass.execute(); + Renderer::setDepthFunction(DepthStencilFunction::LESS); } } // namespace Raz