Skip to content

Auto-calculate stride value on read to fix potential incorrect values in data textures #327

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

Draft
kirill-mapper wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Auto-calculate stride value on read to fix potential incorrect values in data textures #327

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
5d742d2
Fix stride textures in updated calculation method
kirill-mapper Apr 10, 2025
e24c6a0
Added isCompressed flag for GetDXGIFormat
kirill-mapper Apr 11, 2025
c9bb0d3
Update CalculateStride for un/compress textures
kirill-mapper Apr 11, 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
9 changes: 7 additions & 2 deletions CodeWalker.Core/GameFiles/Resources/Texture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,9 +712,12 @@ public int CalcDataSize()
public ushort CalculateStride()
{
if (Format == 0) return 0;
var dxgifmt = DDSIO.GetDXGIFormat(Format);
bool isCompressed;
var dxgifmt = DDSIO.GetDXGIFormat(Format, out isCompressed);
DDSIO.DXTex.ComputePitch(dxgifmt, Width, Height, out var rowPitch, out var slicePitch, 0);
return (ushort)rowPitch;
// For compressed formats (BC/DXT): convert bytes to DWORD units (divide by 4)
// For uncompressed formats: return the original row pitch in bytes
return isCompressed ? (ushort)(rowPitch / 4) : (ushort)(rowPitch);
}
public TextureFormat GetLegacyFormat(TextureFormatG9 format)
{
Expand Down Expand Up @@ -938,6 +941,8 @@ public override void Read(ResourceDataReader reader, params object[] parameters)
this.Unknown_88h = reader.ReadUInt32();
this.Unknown_8Ch = reader.ReadUInt32();

// auto-calculate stride value to fix potential incorrect values in data textures
this.Stride = CalculateStride();
// read reference data
this.Data = reader.ReadBlockAt<TextureData>(this.DataPointer, this.Format, this.Width, this.Height, this.Levels, this.Stride);

Expand Down
21 changes: 14 additions & 7 deletions CodeWalker.Core/GameFiles/Utils/DDSIO.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,18 +500,19 @@ public static TextureFormat GetTextureFormat(DXGI_FORMAT f)
return format;
}

public static DXGI_FORMAT GetDXGIFormat(TextureFormat f)
public static DXGI_FORMAT GetDXGIFormat(TextureFormat f, out bool isCompressed)
{
var format = DXGI_FORMAT.DXGI_FORMAT_UNKNOWN;
isCompressed = false;
switch (f)
{
// compressed
case TextureFormat.D3DFMT_DXT1: format = DXGI_FORMAT.DXGI_FORMAT_BC1_UNORM; break;
case TextureFormat.D3DFMT_DXT3: format = DXGI_FORMAT.DXGI_FORMAT_BC2_UNORM; break;
case TextureFormat.D3DFMT_DXT5: format = DXGI_FORMAT.DXGI_FORMAT_BC3_UNORM; break;
case TextureFormat.D3DFMT_ATI1: format = DXGI_FORMAT.DXGI_FORMAT_BC4_UNORM; break;
case TextureFormat.D3DFMT_ATI2: format = DXGI_FORMAT.DXGI_FORMAT_BC5_UNORM; break;
case TextureFormat.D3DFMT_BC7: format = DXGI_FORMAT.DXGI_FORMAT_BC7_UNORM; break;
case TextureFormat.D3DFMT_DXT1: format = DXGI_FORMAT.DXGI_FORMAT_BC1_UNORM; isCompressed = true; break;
case TextureFormat.D3DFMT_DXT3: format = DXGI_FORMAT.DXGI_FORMAT_BC2_UNORM; isCompressed = true; break;
case TextureFormat.D3DFMT_DXT5: format = DXGI_FORMAT.DXGI_FORMAT_BC3_UNORM; isCompressed = true; break;
case TextureFormat.D3DFMT_ATI1: format = DXGI_FORMAT.DXGI_FORMAT_BC4_UNORM; isCompressed = true; break;
case TextureFormat.D3DFMT_ATI2: format = DXGI_FORMAT.DXGI_FORMAT_BC5_UNORM; isCompressed = true; break;
case TextureFormat.D3DFMT_BC7: format = DXGI_FORMAT.DXGI_FORMAT_BC7_UNORM; isCompressed = true; break;

// uncompressed
case TextureFormat.D3DFMT_A1R5G5B5: format = DXGI_FORMAT.DXGI_FORMAT_B5G5R5A1_UNORM; break;
Expand All @@ -524,6 +525,12 @@ public static DXGI_FORMAT GetDXGIFormat(TextureFormat f)
return format;
}

public static DXGI_FORMAT GetDXGIFormat(TextureFormat f)
{
bool isCompressed;
return GetDXGIFormat(f, out isCompressed);
}

private static ImageStruct GetImageStruct(Texture texture, DXGI_FORMAT format)
{
ImageStruct img = new ImageStruct();
Expand Down