oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Fix GLES texture download to handle mipmaps and cubemap type

Browse source
This commit is contained in:
sfan5 2025-04-06 17:48:42 +02:00
parent 38c3876c4e
commit 9ff07df45e
1 changed files with 27 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

47
irr/src/COpenGLCoreTexture.h
View file

@ -307,13 +307,7 @@ public:
Driver->getCacheHandler()->getTextureCache().set(0, this); Driver->getCacheHandler()->getTextureCache().set(0, this);
TEST_GL_ERROR(Driver); TEST_GL_ERROR(Driver);
GLenum tmpTextureType = TextureType; GLenum tmpTextureType = getTextureTarget(layer);
if (tmpTextureType == GL_TEXTURE_CUBE_MAP) {
_IRR_DEBUG_BREAK_IF(layer > 5)
tmpTextureType = GL_TEXTURE_CUBE_MAP_POSITIVE_X + layer;
}
GL.GetTexImage(tmpTextureType, MipLevelStored, PixelFormat, PixelType, tmpImage->getData()); GL.GetTexImage(tmpTextureType, MipLevelStored, PixelFormat, PixelType, tmpImage->getData());
TEST_GL_ERROR(Driver); TEST_GL_ERROR(Driver);
@ -346,20 +340,31 @@ public:
Driver->getCacheHandler()->getFBO(prevFBO); Driver->getCacheHandler()->getFBO(prevFBO);
Driver->getCacheHandler()->setFBO(tmpFBO); Driver->getCacheHandler()->setFBO(tmpFBO);
Driver->irrGlFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, getOpenGLTextureName(), 0); GLenum tmpTextureType = getTextureTarget(layer);
IImage *tmpImage = Driver->createImage(ECF_A8R8G8B8, Size); // Warning: on GLES 2.0 this call will only work with mipmapLevel == 0
GL.ReadPixels(0, 0, Size.Width, Size.Height, GL_RGBA, GL_UNSIGNED_BYTE, tmpImage->getData()); Driver->irrGlFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
tmpTextureType, getOpenGLTextureName(), mipmapLevel);
TEST_GL_ERROR(Driver);
Driver->irrGlFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, 0, 0); IImage *tmpImage = Driver->createImage(ECF_A8R8G8B8, lockImageSize);
GL.ReadPixels(0, 0, lockImageSize.Width, lockImageSize.Height,
GL_RGBA, GL_UNSIGNED_BYTE, tmpImage->getData());
Driver->irrGlFramebufferTexture2D(GL_FRAMEBUFFER,
GL_COLOR_ATTACHMENT0, tmpTextureType, 0, 0);
Driver->getCacheHandler()->setFBO(prevFBO); Driver->getCacheHandler()->setFBO(prevFBO);
Driver->irrGlDeleteFramebuffers(1, &tmpFBO); Driver->irrGlDeleteFramebuffers(1, &tmpFBO);
TEST_GL_ERROR(Driver);
void *src = tmpImage->getData(); void *src = tmpImage->getData();
void *dest = LockImage->getData(); void *dest = LockImage->getData();
// FIXME: what about ETLF_FLIP_Y_UP_RTT
switch (ColorFormat) { switch (ColorFormat) {
case ECF_A1R5G5B5: case ECF_A1R5G5B5:
CColorConverter::convert_A8R8G8B8toA1B5G5R5(src, tmpImage->getDimension().getArea(), dest); CColorConverter::convert_A8R8G8B8toA1B5G5R5(src, tmpImage->getDimension().getArea(), dest);
@ -386,8 +391,6 @@ public:
LockImage = 0; LockImage = 0;
} }
} }
TEST_GL_ERROR(Driver);
} }
return (LockImage) ? LockImage->getData() : 0; return (LockImage) ? LockImage->getData() : 0;
@ -539,13 +542,7 @@ protected:
if (height < 1) if (height < 1)
height = 1; height = 1;
GLenum tmpTextureType = TextureType; GLenum tmpTextureType = getTextureTarget(layer);
if (tmpTextureType == GL_TEXTURE_CUBE_MAP) {
_IRR_DEBUG_BREAK_IF(layer > 5)
tmpTextureType = GL_TEXTURE_CUBE_MAP_POSITIVE_X + layer;
}
if (!IImage::isCompressedFormat(ColorFormat)) { if (!IImage::isCompressedFormat(ColorFormat)) {
CImage *tmpImage = 0; CImage *tmpImage = 0;
@ -609,6 +606,16 @@ protected:
return GL_TEXTURE_2D; return GL_TEXTURE_2D;
} }
GLenum getTextureTarget(u32 layer) const
{
GLenum tmp = TextureType;
if (tmp == GL_TEXTURE_CUBE_MAP) {
_IRR_DEBUG_BREAK_IF(layer > 5)
tmp = GL_TEXTURE_CUBE_MAP_POSITIVE_X + layer;
}
return tmp;
}
TOpenGLDriver *Driver; TOpenGLDriver *Driver;
GLenum TextureType; GLenum TextureType;