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

OpenGL: Fix TextureSampler mipmap issue

This commit is contained in:
Lynix 2020-05-11 13:58:12 +02:00
parent 6073d8f592
commit 49c68e581a
4 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/Nazara/OpenGLRenderer/OpenGLTextureSampler.hpp
View File

@ -17,18 +17,21 @@ namespace Nz
class NAZARA_OPENGLRENDERER_API OpenGLTextureSampler : public TextureSampler
{
public:
OpenGLTextureSampler(OpenGLDevice& device, TextureSamplerInfo samplerInfo);
OpenGLTextureSampler(OpenGLDevice& device, const TextureSamplerInfo& samplerInfo);
OpenGLTextureSampler(const OpenGLTextureSampler&) = default;
OpenGLTextureSampler(OpenGLTextureSampler&&) noexcept = default;
~OpenGLTextureSampler() = default;
inline const GL::Sampler& GetSampler() const;
inline const GL::Sampler& GetSampler(bool mipmaps) const;
OpenGLTextureSampler& operator=(const OpenGLTextureSampler&) = delete;
OpenGLTextureSampler& operator=(OpenGLTextureSampler&&) = delete;
private:
GL::Sampler m_sampler;
static void BuildSampler(OpenGLDevice& device, GL::Sampler& sampler, const TextureSamplerInfo& samplerInfo, bool withMipmaps);
GL::Sampler m_samplerWithMipmaps;
GL::Sampler m_samplerWithoutMipmaps;
};
}

4
include/Nazara/OpenGLRenderer/OpenGLTextureSampler.inl
View File

@ -7,9 +7,9 @@
namespace Nz
{
inline const GL::Sampler& OpenGLTextureSampler::GetSampler() const
inline const GL::Sampler& OpenGLTextureSampler::GetSampler(bool withMipmaps) const
{
return m_sampler;
return (withMipmaps) ? m_samplerWithMipmaps : m_samplerWithoutMipmaps;
}
}

2
src/Nazara/OpenGLRenderer/OpenGLShaderBinding.cpp
View File

@ -43,8 +43,8 @@ namespace Nz
OpenGLTextureSampler& glSampler = *static_cast<OpenGLTextureSampler*>(texBinding.sampler);
auto& textureDescriptor = m_owner.GetTextureDescriptor(m_poolIndex, m_bindingIndex, resourceIndex);
textureDescriptor.sampler = glSampler.GetSampler().GetObjectId();
textureDescriptor.texture = glTexture.GetTexture().GetObjectId();
textureDescriptor.sampler = glSampler.GetSampler(glTexture.GetLevelCount() > 1).GetObjectId();
break;
}

27
src/Nazara/OpenGLRenderer/OpenGLTextureSampler.cpp
View File

@ -9,21 +9,30 @@
namespace Nz
{
OpenGLTextureSampler::OpenGLTextureSampler(OpenGLDevice& device, TextureSamplerInfo samplerInfo)
OpenGLTextureSampler::OpenGLTextureSampler(OpenGLDevice& device, const TextureSamplerInfo& samplerInfo)
{
if (!m_sampler.Create(device))
BuildSampler(device, m_samplerWithMipmaps, samplerInfo, true);
BuildSampler(device, m_samplerWithoutMipmaps, samplerInfo, false);
}
void OpenGLTextureSampler::BuildSampler(OpenGLDevice& device, GL::Sampler& sampler, const TextureSamplerInfo& samplerInfo, bool withMipmaps)
{
if (!sampler.Create(device))
throw std::runtime_error("failed to create sampler object");
// In OpenGL, min and mipmap sampler are part of the same enum
// In OpenGL, min and mipmap sampler are part of the same enum (and mipmaps filter should only be used with mipmaps)
if (withMipmaps)
sampler.SetParameteri(GL_TEXTURE_MIN_FILTER, ToOpenGL(samplerInfo.minFilter, samplerInfo.mipmapMode));
else
sampler.SetParameteri(GL_TEXTURE_MIN_FILTER, ToOpenGL(samplerInfo.minFilter));
m_sampler.SetParameteri(GL_TEXTURE_MIN_FILTER, ToOpenGL(samplerInfo.minFilter, samplerInfo.mipmapMode));
m_sampler.SetParameteri(GL_TEXTURE_MAG_FILTER, ToOpenGL(samplerInfo.magFilter));
sampler.SetParameteri(GL_TEXTURE_MAG_FILTER, ToOpenGL(samplerInfo.magFilter));
m_sampler.SetParameteri(GL_TEXTURE_WRAP_S, ToOpenGL(samplerInfo.wrapModeU));
m_sampler.SetParameteri(GL_TEXTURE_WRAP_T, ToOpenGL(samplerInfo.wrapModeV));
m_sampler.SetParameteri(GL_TEXTURE_WRAP_R, ToOpenGL(samplerInfo.wrapModeW));
sampler.SetParameteri(GL_TEXTURE_WRAP_S, ToOpenGL(samplerInfo.wrapModeU));
sampler.SetParameteri(GL_TEXTURE_WRAP_T, ToOpenGL(samplerInfo.wrapModeV));
sampler.SetParameteri(GL_TEXTURE_WRAP_R, ToOpenGL(samplerInfo.wrapModeW));
if (samplerInfo.anisotropyLevel > 1.f)
m_sampler.SetParameterf(GL_TEXTURE_MAX_ANISOTROPY_EXT, samplerInfo.anisotropyLevel);
sampler.SetParameterf(GL_TEXTURE_MAX_ANISOTROPY_EXT, samplerInfo.anisotropyLevel);
}
}