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

OpenGLRenderer/Texture: Fix update of non-2D image types

This commit is contained in:
SirLynix 2023-11-26 21:29:19 +01:00
parent f09175228d
commit 00935efbe0
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,7 +78,10 @@ namespace Nz
{ {
NazaraAssert(initialData, "missing initial data"); NazaraAssert(initialData, "missing initial data");
Update(initialData, srcWidth, srcHeight, 0); Boxui wholeRegion(0, 0, 0, m_textureInfo.width, m_textureInfo.height, m_textureInfo.depth);
Image::ArrayToRegion(m_textureInfo.type, 0, m_textureInfo.layerCount, wholeRegion);
Update(initialData, wholeRegion, srcWidth, srcHeight, 0);
if (buildMipmaps && m_textureInfo.levelCount > 1) if (buildMipmaps && m_textureInfo.levelCount > 1)
m_texture.GenerateMipmap(); m_texture.GenerateMipmap();
} }
@ -162,19 +165,17 @@ namespace Nz
switch (m_textureInfo.type) switch (m_textureInfo.type)
{ {
case ImageType::E1D: case ImageType::E1D:
break;
case ImageType::E1D_Array: case ImageType::E1D_Array:
break;
case ImageType::E2D: case ImageType::E2D:
m_texture.TexSubImage2D(GL::TextureTarget::Target2D, level, box.x, box.y, box.width, box.height, format->format, format->type, ptr); m_texture.TexSubImage2D(GL::TextureTarget::Target2D, level, box.x, box.y, box.width, box.height, format->format, format->type, ptr);
break; break;
case ImageType::E2D_Array: case ImageType::E2D_Array:
m_texture.TexSubImage3D(GL::TextureTarget::Target2D_Array, level, box.x, box.y, box.z, box.width, box.height, box.depth, format->format, format->type, ptr);
break; break;
case ImageType::E3D: case ImageType::E3D:
m_texture.TexSubImage3D(GL::TextureTarget::Target3D, level, box.x, box.y, box.z, box.width, box.height, box.depth, format->format, format->type, ptr);
break; break;
case ImageType::Cubemap: case ImageType::Cubemap:
@ -194,6 +195,12 @@ namespace Nz
break; break;
} }
if (!context.DidLastCallSucceed())
{
NazaraError("texture update failed");
return false;
}
return true; return true;
} }