dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2025-04-15 14:41:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix loading of DDS textures with incomplete mipmaps

Browse source 
Apparently OpenGL (or at least nvidias driver?) is unhappy if the
smallest mipmaplevel isn't 1x1 pixels. It doesn't show any error in
debug messages, but it's just set to black.
This can be worked around by setting GL_TEXTURE_MAX_LEVEL
This commit is contained in:
Daniel Gibson 2025-03-05 18:22:10 +01:00
parent 08c81e5693
commit 8fd317ab4c
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
neo/renderer/Image_load.cpp
View file

@ -1536,6 +1536,7 @@ void idImage::UploadPrecompressedImage( byte *data, int len ) {
int uw = uploadWidth;
int uh = uploadHeight;
int lastUW = uw, lastUH = uh;
// We may skip some mip maps if we are downsizing
int skipMip = 0;
@ -1561,6 +1562,8 @@ void idImage::UploadPrecompressedImage( byte *data, int len ) {
qglTexImage2D( GL_TEXTURE_2D, i - skipMip, internalFormat, uw, uh, 0, externalFormat, GL_UNSIGNED_BYTE, imagedata );
}
}
lastUW = uw;
lastUH = uh;
imagedata += size;
uw /= 2;
@ -1572,6 +1575,19 @@ void idImage::UploadPrecompressedImage( byte *data, int len ) {
uh = 1;
}
}
// in case the mipmap chain is incomplete (doesn't go down to 1x1 pixel)
// the texture may be shown as black unless GL_TEXTURE_MAX_LEVEL is set accordingly
if ( lastUW > 1 || lastUH > 1 ) {
numMipmaps -= skipMip;
if ( numMipmaps == 1 ) {
// if there is only one mipmap, just don't use mipmapping for this texture
if ( filter == TF_DEFAULT ) {
filter = TF_LINEAR;
}
} else {
qglTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, numMipmaps - 1 );
}
}
SetImageFilterAndRepeat();
}