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

Renderer/Texture: Add compressed format support (experimental too) 

Former-commit-id: 0835aaa2e6ab6800516c88d47e04796465a65644
This commit is contained in:
Lynix 2016-04-21 13:23:57 +02:00
parent 226d75a352
commit 75a5dd8625
1 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/Nazara/Renderer/Texture.cpp
View File

@ -1019,25 +1019,52 @@ namespace Nz
glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, srcHeight); glPixelStorei(GL_UNPACK_IMAGE_HEIGHT, srcHeight);
OpenGL::BindTexture(m_impl->type, m_impl->id); OpenGL::BindTexture(m_impl->type, m_impl->id);
switch (m_impl->type)
if (PixelFormat::IsCompressed(m_impl->format))
{ {
case ImageType_1D: switch (m_impl->type)
glTexSubImage1D(GL_TEXTURE_1D, level, box.x, box.width, format.dataFormat, format.dataType, pixels); {
break; case ImageType_1D:
glCompressedTexSubImage1D(GL_TEXTURE_1D, level, box.x, box.width, format.internalFormat, PixelFormat::ComputeSize(m_impl->format, box.width, 1, 1), pixels);
break;
case ImageType_1D_Array: case ImageType_1D_Array:
case ImageType_2D: case ImageType_2D:
glTexSubImage2D(OpenGL::TextureTarget[m_impl->type], level, box.x, box.y, box.width, box.height, format.dataFormat, format.dataType, pixels); glCompressedTexSubImage2D(OpenGL::TextureTarget[m_impl->type], level, box.x, box.y, box.width, box.height, format.internalFormat, PixelFormat::ComputeSize(m_impl->format, box.width, box.height, 1), pixels);
break; break;
case ImageType_2D_Array: case ImageType_2D_Array:
case ImageType_3D: case ImageType_3D:
glTexSubImage3D(OpenGL::TextureTarget[m_impl->type], level, box.x, box.y, box.z, box.width, box.height, box.depth, format.dataFormat, format.dataType, pixels); glCompressedTexSubImage3D(OpenGL::TextureTarget[m_impl->type], level, box.x, box.y, box.z, box.width, box.height, box.depth, format.internalFormat, PixelFormat::ComputeSize(m_impl->format, box.width, box.height, box.depth), pixels);
break; break;
case ImageType_Cubemap: case ImageType_Cubemap:
glTexSubImage2D(OpenGL::CubemapFace[box.z], level, box.x, box.y, box.width, box.height, format.dataFormat, format.dataType, pixels); glCompressedTexSubImage2D(OpenGL::CubemapFace[box.z], level, box.x, box.y, box.width, box.height, format.internalFormat, PixelFormat::ComputeSize(m_impl->format, box.width, box.height, box.depth), pixels);
break; break;
}
}
else
{
switch (m_impl->type)
{
case ImageType_1D:
glTexSubImage1D(GL_TEXTURE_1D, level, box.x, box.width, format.dataFormat, format.dataType, pixels);
break;
case ImageType_1D_Array:
case ImageType_2D:
glTexSubImage2D(OpenGL::TextureTarget[m_impl->type], level, box.x, box.y, box.width, box.height, format.dataFormat, format.dataType, pixels);
break;
case ImageType_2D_Array:
case ImageType_3D:
glTexSubImage3D(OpenGL::TextureTarget[m_impl->type], level, box.x, box.y, box.z, box.width, box.height, box.depth, format.dataFormat, format.dataType, pixels);
break;
case ImageType_Cubemap:
glTexSubImage2D(OpenGL::CubemapFace[box.z], level, box.x, box.y, box.width, box.height, format.dataFormat, format.dataType, pixels);
break;
}
} }
return true; return true;