Skip to content

Honor DWORD-aligned rows in 24-bit BMP textures #108

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

Open
PS2HomeDeveloper wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Honor DWORD-aligned rows in 24-bit BMP textures #108

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c21140d
Honor DWORD-aligned rows in 24-bit BMP textures
PS2HomeDeveloper Oct 7, 2026
490a9d8
Update gsToolkit.c
PS2HomeDeveloper Oct 7, 2026
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
35 changes: 28 additions & 7 deletions ee/toolkit/src/gsToolkit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,8 +488,27 @@ int gsKit_texture_bmp(GSGLOBAL *gsGlobal, GSTEXTURE *Texture, char *Path)
Texture->Mem = memalign(128,TextureSize);

if(Bitmap.InfoHeader.BitCount == 24)
{
image = memalign(128, FTexSize);
{
u64 RowStride64;
u32 RowStride;
u8 *SourceRow;

RowStride64 = (((u64)Texture->Width * 24 + 31) & ~31ULL) >> 3;
if (Texture->Width == 0 || Texture->Height == 0 ||
RowStride64 == 0 || RowStride64 > FTexSize ||
Texture->Height > FTexSize / RowStride64)
{
printf("BMP: Invalid 24-bit image data size\n");
if (Texture->Mem) {
free(Texture->Mem);
Texture->Mem = NULL;
}
fclose(File);
return -1;
}
RowStride = (u32)RowStride64;

image = memalign(128, FTexSize);
if (image == NULL) {
printf("BMP: Failed to allocate memory\n");
if (Texture->Mem) {
Expand All @@ -507,11 +526,13 @@ int gsKit_texture_bmp(GSGLOBAL *gsGlobal, GSTEXTURE *Texture, char *Path)
fread(image, FTexSize, 1, File);
p = (void *)((u32)Texture->Mem);
for (y = Texture->Height - 1, cy = 0; y >= 0; y--, cy++) {
for (x = 0; x < Texture->Width; x++) {
p[(y * Texture->Width + x) * 3 + 2] = image[(cy * Texture->Width + x) * 3 + 0];
p[(y * Texture->Width + x) * 3 + 1] = image[(cy * Texture->Width + x) * 3 + 1];
p[(y * Texture->Width + x) * 3 + 0] = image[(cy * Texture->Width + x) * 3 + 2];
}
SourceRow = image + (u32)cy * RowStride;

for (x = 0; x < Texture->Width; x++) {
p[(y * Texture->Width + x) * 3 + 2] = SourceRow[x * 3 + 0];
p[(y * Texture->Width + x) * 3 + 1] = SourceRow[x * 3 + 1];
p[(y * Texture->Width + x) * 3 + 0] = SourceRow[x * 3 + 2];
}
}
free(image);
image = NULL;
Expand Down