From 52f80a68cb8d5e3b244153237331bdb895197ba7 Mon Sep 17 00:00:00 2001 From: Lynix Date: Sat, 21 Apr 2018 00:28:57 +0200 Subject: [PATCH] Renderer/OpenGL: Enable GL_TEXTURE_CUBE_MAP_SEAMLESS --- ChangeLog.md | 1 + include/Nazara/Renderer/OpenGL.hpp | 1 + src/Nazara/Renderer/Context.cpp | 3 +++ src/Nazara/Renderer/OpenGL.cpp | 3 +++ 4 files changed, 8 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index 7dc258795..27b762a17 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -92,6 +92,7 @@ Nazara Engine: - ⚠️ Translucent2D pipeline no longer has depth sorting - Fixed SimpleTextDrawer line bounds - ⚠️ Stream::ReadLine will now returns empty lines if present in the file +- Fixed cubemaps seams with OpenGL Nazara Development Kit: - Added ImageWidget (#139) diff --git a/include/Nazara/Renderer/OpenGL.hpp b/include/Nazara/Renderer/OpenGL.hpp index 7768930fb..c87426f12 100644 --- a/include/Nazara/Renderer/OpenGL.hpp +++ b/include/Nazara/Renderer/OpenGL.hpp @@ -38,6 +38,7 @@ namespace Nz OpenGLExtension_FP64, OpenGLExtension_GetProgramBinary, OpenGLExtension_SeparateShaderObjects, + OpenGLExtension_SeamlessCubeMap, OpenGLExtension_Shader_ImageLoadStore, OpenGLExtension_TextureCompression_s3tc, OpenGLExtension_TextureStorage, diff --git a/src/Nazara/Renderer/Context.cpp b/src/Nazara/Renderer/Context.cpp index 7fbad6002..90a17122d 100644 --- a/src/Nazara/Renderer/Context.cpp +++ b/src/Nazara/Renderer/Context.cpp @@ -163,6 +163,9 @@ namespace Nz return false; } + if (OpenGL::IsSupported(OpenGLExtension_SeamlessCubeMap)) + glEnable(GL_TEXTURE_CUBE_MAP_SEAMLESS); + if (m_parameters.antialiasingLevel > 0) glEnable(GL_MULTISAMPLE); diff --git a/src/Nazara/Renderer/OpenGL.cpp b/src/Nazara/Renderer/OpenGL.cpp index 7be48585f..0d6f07d2e 100644 --- a/src/Nazara/Renderer/OpenGL.cpp +++ b/src/Nazara/Renderer/OpenGL.cpp @@ -1174,6 +1174,9 @@ namespace Nz } } + // Seamless Cubemap Filtering + s_openGLextensions[OpenGLExtension_SeamlessCubeMap] = (s_openglVersion >= 320 || IsSupported("GL_ARB_seamless_cube_map")); + // Shader_ImageLoadStore s_openGLextensions[OpenGLExtension_Shader_ImageLoadStore] = (s_openglVersion >= 420 || IsSupported("GL_ARB_shader_image_load_store"));