Skip to content

Fix KTX file format support and unify image reader logs #335

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
merged 9 commits into from
May 13, 2020
Merged

Fix KTX file format support and unify image reader logs #335

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b2b3d63
Fix KTX file format support
dimhotepus Apr 27, 2020
bb1f85f
Cleanup save KTX method
dimhotepus Apr 27, 2020
75f2480
Free KTX image data in case of failure (future-proof)
dimhotepus Apr 27, 2020
23289fb
Cleanup WebP texture loader
dimhotepus Apr 27, 2020
e916683
Rename KTX texture to image in log messages
dimhotepus Apr 27, 2020
a9bcd14
Use common schema for image load logs
dimhotepus Apr 27, 2020
16722b9
pr: Use upper-case 'U' for unsigned int constants
dimhotepus May 7, 2020
91f8ff4
pr: Check data ptr is not out of file bounds
dimhotepus May 7, 2020
9df5869
pr: Check last KTX image validity. Detailed errors for KTX
dimhotepus May 12, 2020
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
11 changes: 5 additions & 6 deletions src/engine/renderer/tr_image_ktx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,18 +179,17 @@ bool LoadInMemoryKTX( const char *name, void *ktxData, size_t ktxSize,
IsNonArrayCubemapTexture(hdr) ? hdr->numberOfFaces : 1U};

for(uint32_t i{ 0 }; i < hdr->numberOfMipmapLevels; i++) {
if ( !IsValidKTXFileStreamPosition( ptr, ktxSize, static_cast<const byte*>(ktxData) ) ) {
Log::Warn("KTX image '%s' has bad header or texture data", name);
return false;
}

const uint32_t imageSize{ GetImageSize( ptr, needReverseBytes ) };

totalImageSize += imageSize * mipmapLevelCoefficient;
ptr += sizeof(uint32_t) + imageSize;
}

// ptr points to next byte after ktxData buffer end.
if ( !IsValidKTXFileStreamPosition( ptr - 1, ktxSize, static_cast<const byte *>(ktxData) ) ) {
Log::Warn("KTX image '%s' has bad header or texture data", name);
return false;
}

ptr = firstImageDataPtr;
data[ 0 ] = (byte *)ri.Z_Malloc(totalImageSize);

Expand Down