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

OpenGLRenderer: Fix textures

Browse Source
This commit is contained in:
Jérôme Leclercq
2020-08-09 18:38:58 +02:00
parent 0da2ee6c99
commit ac7b523bc7
5 changed files with 60 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/Nazara/OpenGLRenderer/OpenGLTexture.cpp
View File

@@ -17,21 +17,9 @@ namespace Nz
if (!m_texture.Create(device))
throw std::runtime_error("failed to create texture object");
GLint internalFormat;
switch (params.pixelFormat)
{
case PixelFormat_RGB8:
{
internalFormat = GL_SRGB8;
break;
}
case PixelFormat_RGBA8:
{
internalFormat = GL_SRGB8_ALPHA8;
break;
}
}
auto format = DescribeTextureFormat(params.pixelFormat);
if (!format)
throw std::runtime_error("unsupported texture format");
switch (params.type)
{
@@ -43,7 +31,7 @@ namespace Nz
case ImageType_2D:
for (unsigned int level = 0; level < m_params.mipmapLevel; ++level)
m_texture.TexImage2D(0, internalFormat, GetLevelSize(params.width, level), GetLevelSize(params.height, level), 0);
m_texture.TexImage2D(0, format->internalFormat, GetLevelSize(params.width, level), GetLevelSize(params.height, level), 0, format->format, format->type);
break;
case ImageType_2D_Array:
@@ -60,6 +48,10 @@ namespace Nz
}
m_texture.SetParameteri(GL_TEXTURE_MAX_LEVEL, m_params.mipmapLevel);
m_texture.SetParameteri(GL_TEXTURE_SWIZZLE_R, format->swizzleR);
m_texture.SetParameteri(GL_TEXTURE_SWIZZLE_G, format->swizzleG);
m_texture.SetParameteri(GL_TEXTURE_SWIZZLE_B, format->swizzleB);
m_texture.SetParameteri(GL_TEXTURE_SWIZZLE_A, format->swizzleA);
}
PixelFormat OpenGLTexture::GetFormat() const
@@ -84,25 +76,9 @@ namespace Nz
bool OpenGLTexture::Update(const void* ptr)
{
GLint format;
GLint type;
switch (m_params.pixelFormat)
{
case PixelFormat_RGB8:
{
format = GL_RGB;
type = GL_UNSIGNED_BYTE;
break;
}
auto format = DescribeTextureFormat(m_params.pixelFormat);
assert(format);
case PixelFormat_RGBA8:
{
format = GL_RGBA;
type = GL_UNSIGNED_BYTE;
break;
}
}
switch (m_params.type)
{
case ImageType_1D:
@@ -112,7 +88,7 @@ namespace Nz
break;
case ImageType_2D:
m_texture.TexSubImage2D(0, 0, 0, m_params.width, m_params.height, format, type, ptr);
m_texture.TexSubImage2D(0, 0, 0, m_params.width, m_params.height, format->format, format->type, ptr);
break;
case ImageType_2D_Array: