Skip to content

bugfix(textureloader): Fix Generals game hang with TextureLoader::Validate_Texture_Size #1439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 3 commits into from
Aug 10, 2025
Merged

bugfix(textureloader): Fix Generals game hang with TextureLoader::Validate_Texture_Size #1439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e392b99
Fix generals hang in infinite loop
ryan-de-boer Aug 9, 2025
bbc720c
Set depth to 1
ryan-de-boer Aug 10, 2025
efc148f
Set depth for ThumbnailClass
ryan-de-boer Aug 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.cpp
View file
Open in desktop
Comment thread
xezon marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -1046,7 +1046,7 @@ void TextureLoadTaskClass::Begin_Texture_Load()
DDSFileClass dds_file(Texture->Get_Full_Path(),Get_Reduction());
if (dds_file.Is_Available()) {
// Destination size will be the next power of two square from the larger width and height...
unsigned width, height, depth;
unsigned width=0, height=0, depth=1;
width=dds_file.Get_Width(0);
height=dds_file.Get_Height(0);
TextureLoader::Validate_Texture_Size(width,height,depth);
Expand Down Expand Up @@ -1120,7 +1120,7 @@ void TextureLoadTaskClass::Begin_Texture_Load()
}

// Destination size will be the next power of two square from the larger width and height...
unsigned width=targa.Header.Width, height=targa.Header.Height, depth;
unsigned width=targa.Header.Width, height=targa.Header.Height, depth=1;
int ReductionFactor=Get_Reduction();
int MipLevels=0;

Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ ThumbnailClass::ThumbnailClass(const StringClass& filename)
// Destination size will be the next power of two square from the larger width and height...
Width=targa.Header.Width>>reduction_factor;
Height=targa.Header.Height>>reduction_factor;
unsigned depth;
unsigned depth=1;
TextureLoader::Validate_Texture_Size(Width,Height,depth);
unsigned src_width=targa.Header.Width;
unsigned src_height=targa.Header.Height;
Expand Down
Loading