Improved texture creation
Fixed possible wasted space on NVidia hardware Former-commit-id: 42a26c88d8bd03b1ac845c62984cf8c355f1902a
This commit is contained in:
Lynix
parent
ed1cc7a092
commit
97ff9bc4ac
|
|
@ -101,6 +101,7 @@ class NAZARA_API NzTexture : public NzResource, NzNonCopyable
|
||||||
static bool IsTypeSupported(nzImageType type);
|
static bool IsTypeSupported(nzImageType type);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
bool CreateTexture(bool proxy);
|
||||||
void InvalidateMipmaps();
|
void InvalidateMipmaps();
|
||||||
|
|
||||||
NzTextureImpl* m_impl = nullptr;
|
NzTextureImpl* m_impl = nullptr;
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
// For conditions of distribution and use, see copyright notice in Config.hpp
|
// For conditions of distribution and use, see copyright notice in Config.hpp
|
||||||
|
|
||||||
#include <Nazara/Renderer/Texture.hpp>
|
#include <Nazara/Renderer/Texture.hpp>
|
||||||
|
#include <Nazara/Core/CallOnExit.hpp>
|
||||||
#include <Nazara/Core/Error.hpp>
|
#include <Nazara/Core/Error.hpp>
|
||||||
#include <Nazara/Renderer/Context.hpp>
|
#include <Nazara/Renderer/Context.hpp>
|
||||||
#include <Nazara/Renderer/Renderer.hpp>
|
#include <Nazara/Renderer/Renderer.hpp>
|
||||||
|
|
@ -28,123 +29,6 @@ struct NzTextureImpl
|
||||||
|
|
||||||
namespace
|
namespace
|
||||||
{
|
{
|
||||||
bool CreateTexture(NzTextureImpl* impl, bool proxy)
|
|
||||||
{
|
|
||||||
NzOpenGL::Format openGLFormat;
|
|
||||||
if (!NzOpenGL::TranslateFormat(impl->format, &openGLFormat, NzOpenGL::FormatType_Texture))
|
|
||||||
{
|
|
||||||
NazaraError("Format " + NzPixelFormat::ToString(impl->format) + " not supported by OpenGL");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
GLenum target = (proxy) ? NzOpenGL::TextureTargetProxy[impl->type] : NzOpenGL::TextureTarget[impl->type];
|
|
||||||
switch (impl->type)
|
|
||||||
{
|
|
||||||
case nzImageType_1D:
|
|
||||||
{
|
|
||||||
if (glTexStorage1D && !proxy) // Les drivers AMD semblent ne pas aimer glTexStorage avec un format proxy
|
|
||||||
glTexStorage1D(target, impl->levelCount, openGLFormat.internalFormat, impl->width);
|
|
||||||
else
|
|
||||||
{
|
|
||||||
unsigned int w = impl->width;
|
|
||||||
for (nzUInt8 level = 0; level < impl->levelCount; ++level)
|
|
||||||
{
|
|
||||||
glTexImage1D(target, level, openGLFormat.internalFormat, w, 0, openGLFormat.dataFormat, openGLFormat.dataType, nullptr);
|
|
||||||
if (w > 1U)
|
|
||||||
w >>= 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case nzImageType_1D_Array:
|
|
||||||
case nzImageType_2D:
|
|
||||||
{
|
|
||||||
if (glTexStorage2D && !proxy)
|
|
||||||
glTexStorage2D(target, impl->levelCount, openGLFormat.internalFormat, impl->width, impl->height);
|
|
||||||
else
|
|
||||||
{
|
|
||||||
unsigned int w = impl->width;
|
|
||||||
unsigned int h = impl->height;
|
|
||||||
for (nzUInt8 level = 0; level < impl->levelCount; ++level)
|
|
||||||
{
|
|
||||||
glTexImage2D(target, level, openGLFormat.internalFormat, w, h, 0, openGLFormat.dataFormat, openGLFormat.dataType, nullptr);
|
|
||||||
if (w > 1U)
|
|
||||||
w >>= 1;
|
|
||||||
|
|
||||||
if (h > 1U)
|
|
||||||
h >>= 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case nzImageType_2D_Array:
|
|
||||||
case nzImageType_3D:
|
|
||||||
{
|
|
||||||
if (glTexStorage3D && !proxy)
|
|
||||||
glTexStorage3D(target, impl->levelCount, openGLFormat.internalFormat, impl->width, impl->height, impl->depth);
|
|
||||||
else
|
|
||||||
{
|
|
||||||
unsigned int w = impl->width;
|
|
||||||
unsigned int h = impl->height;
|
|
||||||
unsigned int d = impl->depth;
|
|
||||||
for (nzUInt8 level = 0; level < impl->levelCount; ++level)
|
|
||||||
{
|
|
||||||
glTexImage3D(target, level, openGLFormat.internalFormat, w, h, d, 0, openGLFormat.dataFormat, openGLFormat.dataType, nullptr);
|
|
||||||
if (w > 1U)
|
|
||||||
w >>= 1;
|
|
||||||
|
|
||||||
if (h > 1U)
|
|
||||||
h >>= 1;
|
|
||||||
|
|
||||||
if (d > 1U)
|
|
||||||
d >>= 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
case nzImageType_Cubemap:
|
|
||||||
{
|
|
||||||
if (glTexStorage2D && !proxy)
|
|
||||||
glTexStorage2D(target, impl->levelCount, openGLFormat.internalFormat, impl->width, impl->height);
|
|
||||||
else
|
|
||||||
{
|
|
||||||
unsigned int size = impl->width; // Les cubemaps ont une longueur et largeur identique
|
|
||||||
for (nzUInt8 level = 0; level < impl->levelCount; ++level)
|
|
||||||
{
|
|
||||||
for (GLenum face : NzOpenGL::CubemapFace)
|
|
||||||
glTexImage2D(face, level, openGLFormat.internalFormat, size, size, 0, openGLFormat.dataFormat, openGLFormat.dataType, nullptr);
|
|
||||||
|
|
||||||
if (size > 1U)
|
|
||||||
size >>= 1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (proxy)
|
|
||||||
{
|
|
||||||
GLint internalFormat = 0;
|
|
||||||
glGetTexLevelParameteriv(target, 0, GL_TEXTURE_INTERNAL_FORMAT, &internalFormat);
|
|
||||||
if (internalFormat == 0)
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Application du swizzle
|
|
||||||
if (NzOpenGL::GetVersion() >= 300)
|
|
||||||
{
|
|
||||||
glTexParameteri(target, GL_TEXTURE_SWIZZLE_R, openGLFormat.swizzle[0]);
|
|
||||||
glTexParameteri(target, GL_TEXTURE_SWIZZLE_G, openGLFormat.swizzle[1]);
|
|
||||||
glTexParameteri(target, GL_TEXTURE_SWIZZLE_B, openGLFormat.swizzle[2]);
|
|
||||||
glTexParameteri(target, GL_TEXTURE_SWIZZLE_A, openGLFormat.swizzle[3]);
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void SetUnpackAlignement(nzUInt8 bpp)
|
inline void SetUnpackAlignement(nzUInt8 bpp)
|
||||||
{
|
{
|
||||||
if (bpp % 8 == 0)
|
if (bpp % 8 == 0)
|
||||||
|
|
@ -273,40 +157,44 @@ bool NzTexture::Create(nzImageType type, nzPixelFormat format, unsigned int widt
|
||||||
levelCount = 1;
|
levelCount = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::unique_ptr<NzTextureImpl> impl(new NzTextureImpl);
|
m_impl = new NzTextureImpl;
|
||||||
glGenTextures(1, &impl->id);
|
m_impl->depth = GetValidSize(depth);
|
||||||
|
m_impl->format = format;
|
||||||
|
m_impl->height = GetValidSize(height);
|
||||||
|
m_impl->levelCount = levelCount;
|
||||||
|
m_impl->type = type;
|
||||||
|
m_impl->width = GetValidSize(width);
|
||||||
|
|
||||||
impl->depth = GetValidSize(depth);
|
glGenTextures(1, &m_impl->id);
|
||||||
impl->format = format;
|
NzOpenGL::BindTexture(m_impl->type, m_impl->id);
|
||||||
impl->height = GetValidSize(height);
|
|
||||||
impl->levelCount = levelCount;
|
|
||||||
impl->type = type;
|
|
||||||
impl->width = GetValidSize(width);
|
|
||||||
|
|
||||||
NzOpenGL::BindTexture(impl->type, impl->id);
|
// En cas d'erreur (sortie prématurée), on détruit la texture
|
||||||
|
NzCallOnExit onExit([this]()
|
||||||
// Vérification du support par la carte graphique
|
|
||||||
if (!CreateTexture(impl.get(), true))
|
|
||||||
{
|
{
|
||||||
NzOpenGL::DeleteTexture(m_impl->id);
|
Destroy();
|
||||||
|
});
|
||||||
|
|
||||||
|
// On précise le nombre de mipmaps avant la spécification de la texture
|
||||||
|
// https://www.opengl.org/wiki/Hardware_specifics:_NVidia
|
||||||
|
SetMipmapRange(0, m_impl->levelCount-1);
|
||||||
|
if (m_impl->levelCount > 1U)
|
||||||
|
EnableMipmapping(true);
|
||||||
|
|
||||||
|
// Vérification du support par la carte graphique (texture proxy)
|
||||||
|
if (!CreateTexture(true))
|
||||||
|
{
|
||||||
NazaraError("Texture's parameters not supported by driver");
|
NazaraError("Texture's parameters not supported by driver");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Création de la texture
|
// Création de la texture
|
||||||
if (!CreateTexture(impl.get(), false))
|
if (!CreateTexture(false))
|
||||||
{
|
{
|
||||||
NzOpenGL::DeleteTexture(m_impl->id);
|
|
||||||
|
|
||||||
NazaraError("Failed to create texture");
|
NazaraError("Failed to create texture");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
m_impl = impl.release();
|
onExit.Reset();
|
||||||
|
|
||||||
if (m_impl->levelCount > 1U)
|
|
||||||
EnableMipmapping(true);
|
|
||||||
|
|
||||||
NotifyCreated();
|
NotifyCreated();
|
||||||
return true;
|
return true;
|
||||||
|
|
@ -1336,6 +1224,123 @@ bool NzTexture::IsTypeSupported(nzImageType type)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool NzTexture::CreateTexture(bool proxy)
|
||||||
|
{
|
||||||
|
NzOpenGL::Format openGLFormat;
|
||||||
|
if (!NzOpenGL::TranslateFormat(m_impl->format, &openGLFormat, NzOpenGL::FormatType_Texture))
|
||||||
|
{
|
||||||
|
NazaraError("Format " + NzPixelFormat::ToString(m_impl->format) + " not supported by OpenGL");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
GLenum target = (proxy) ? NzOpenGL::TextureTargetProxy[m_impl->type] : NzOpenGL::TextureTarget[m_impl->type];
|
||||||
|
switch (m_impl->type)
|
||||||
|
{
|
||||||
|
case nzImageType_1D:
|
||||||
|
{
|
||||||
|
if (glTexStorage1D && !proxy) // Les drivers AMD semblent ne pas aimer glTexStorage avec un format proxy
|
||||||
|
glTexStorage1D(target, m_impl->levelCount, openGLFormat.internalFormat, m_impl->width);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
unsigned int w = m_impl->width;
|
||||||
|
for (nzUInt8 level = 0; level < m_impl->levelCount; ++level)
|
||||||
|
{
|
||||||
|
glTexImage1D(target, level, openGLFormat.internalFormat, w, 0, openGLFormat.dataFormat, openGLFormat.dataType, nullptr);
|
||||||
|
if (w > 1U)
|
||||||
|
w >>= 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case nzImageType_1D_Array:
|
||||||
|
case nzImageType_2D:
|
||||||
|
{
|
||||||
|
if (glTexStorage2D && !proxy)
|
||||||
|
glTexStorage2D(target, m_impl->levelCount, openGLFormat.internalFormat, m_impl->width, m_impl->height);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
unsigned int w = m_impl->width;
|
||||||
|
unsigned int h = m_impl->height;
|
||||||
|
for (nzUInt8 level = 0; level < m_impl->levelCount; ++level)
|
||||||
|
{
|
||||||
|
glTexImage2D(target, level, openGLFormat.internalFormat, w, h, 0, openGLFormat.dataFormat, openGLFormat.dataType, nullptr);
|
||||||
|
if (w > 1U)
|
||||||
|
w >>= 1;
|
||||||
|
|
||||||
|
if (h > 1U)
|
||||||
|
h >>= 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case nzImageType_2D_Array:
|
||||||
|
case nzImageType_3D:
|
||||||
|
{
|
||||||
|
if (glTexStorage3D && !proxy)
|
||||||
|
glTexStorage3D(target, m_impl->levelCount, openGLFormat.internalFormat, m_impl->width, m_impl->height, m_impl->depth);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
unsigned int w = m_impl->width;
|
||||||
|
unsigned int h = m_impl->height;
|
||||||
|
unsigned int d = m_impl->depth;
|
||||||
|
for (nzUInt8 level = 0; level < m_impl->levelCount; ++level)
|
||||||
|
{
|
||||||
|
glTexImage3D(target, level, openGLFormat.internalFormat, w, h, d, 0, openGLFormat.dataFormat, openGLFormat.dataType, nullptr);
|
||||||
|
if (w > 1U)
|
||||||
|
w >>= 1;
|
||||||
|
|
||||||
|
if (h > 1U)
|
||||||
|
h >>= 1;
|
||||||
|
|
||||||
|
if (d > 1U)
|
||||||
|
d >>= 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case nzImageType_Cubemap:
|
||||||
|
{
|
||||||
|
if (glTexStorage2D && !proxy)
|
||||||
|
glTexStorage2D(target, m_impl->levelCount, openGLFormat.internalFormat, m_impl->width, m_impl->height);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
unsigned int size = m_impl->width; // Les cubemaps ont une longueur et largeur identique
|
||||||
|
for (nzUInt8 level = 0; level < m_impl->levelCount; ++level)
|
||||||
|
{
|
||||||
|
for (GLenum face : NzOpenGL::CubemapFace)
|
||||||
|
glTexImage2D(face, level, openGLFormat.internalFormat, size, size, 0, openGLFormat.dataFormat, openGLFormat.dataType, nullptr);
|
||||||
|
|
||||||
|
if (size > 1U)
|
||||||
|
size >>= 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (proxy)
|
||||||
|
{
|
||||||
|
GLint internalFormat = 0;
|
||||||
|
glGetTexLevelParameteriv(target, 0, GL_TEXTURE_INTERNAL_FORMAT, &internalFormat);
|
||||||
|
if (internalFormat == 0)
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Application du swizzle
|
||||||
|
if (!proxy && NzOpenGL::GetVersion() >= 300)
|
||||||
|
{
|
||||||
|
glTexParameteri(target, GL_TEXTURE_SWIZZLE_R, openGLFormat.swizzle[0]);
|
||||||
|
glTexParameteri(target, GL_TEXTURE_SWIZZLE_G, openGLFormat.swizzle[1]);
|
||||||
|
glTexParameteri(target, GL_TEXTURE_SWIZZLE_B, openGLFormat.swizzle[2]);
|
||||||
|
glTexParameteri(target, GL_TEXTURE_SWIZZLE_A, openGLFormat.swizzle[3]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
void NzTexture::InvalidateMipmaps()
|
void NzTexture::InvalidateMipmaps()
|
||||||
{
|
{
|
||||||
#if NAZARA_RENDERER_SAFE
|
#if NAZARA_RENDERER_SAFE
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue