mirror of
https://github.com/ryujinx-mirror/ryujinx.git
synced 2024-12-23 08:05:48 +00:00
Support 3D ASTC textures (using 2D blocks)
This commit is contained in:
parent
6b13c5b439
commit
23b8a86d35
2 changed files with 6 additions and 15 deletions
|
@ -257,7 +257,6 @@ namespace Ryujinx.Graphics.Gpu.Image
|
||||||
data,
|
data,
|
||||||
_info.FormatInfo.BlockWidth,
|
_info.FormatInfo.BlockWidth,
|
||||||
_info.FormatInfo.BlockHeight,
|
_info.FormatInfo.BlockHeight,
|
||||||
1,
|
|
||||||
_info.Width,
|
_info.Width,
|
||||||
_info.Height,
|
_info.Height,
|
||||||
_depth,
|
_depth,
|
||||||
|
|
|
@ -51,7 +51,6 @@ namespace Ryujinx.Graphics.Texture.Astc
|
||||||
Span<byte> data,
|
Span<byte> data,
|
||||||
int blockWidth,
|
int blockWidth,
|
||||||
int blockHeight,
|
int blockHeight,
|
||||||
int blockDepth,
|
|
||||||
int width,
|
int width,
|
||||||
int height,
|
int height,
|
||||||
int depth,
|
int depth,
|
||||||
|
@ -64,17 +63,6 @@ namespace Ryujinx.Graphics.Texture.Astc
|
||||||
{
|
{
|
||||||
BinaryReader binReader = new BinaryReader(inputStream);
|
BinaryReader binReader = new BinaryReader(inputStream);
|
||||||
|
|
||||||
if (blockWidth > 12 || blockHeight > 12)
|
|
||||||
{
|
|
||||||
throw new AstcDecoderException("Invalid block size.");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (blockDepth != 1 || depth != 1)
|
|
||||||
{
|
|
||||||
// TODO: Support 3D textures.
|
|
||||||
throw new NotImplementedException("3D compressed textures are not unsupported.");
|
|
||||||
}
|
|
||||||
|
|
||||||
using (MemoryStream outputStream = new MemoryStream())
|
using (MemoryStream outputStream = new MemoryStream())
|
||||||
{
|
{
|
||||||
int blockIndex = 0;
|
int blockIndex = 0;
|
||||||
|
@ -83,6 +71,9 @@ namespace Ryujinx.Graphics.Texture.Astc
|
||||||
|
|
||||||
for (int l = 0; l < levels; l++)
|
for (int l = 0; l < levels; l++)
|
||||||
{
|
{
|
||||||
|
int sliceSize = width * height * 4;
|
||||||
|
|
||||||
|
for (int k = 0; k < depth; k++)
|
||||||
for (int j = 0; j < height; j += blockHeight)
|
for (int j = 0; j < height; j += blockHeight)
|
||||||
for (int i = 0; i < width; i += blockWidth)
|
for (int i = 0; i < width; i += blockWidth)
|
||||||
{
|
{
|
||||||
|
@ -100,7 +91,7 @@ namespace Ryujinx.Graphics.Texture.Astc
|
||||||
int decompressedWidth = Math.Min(blockWidth, width - i);
|
int decompressedWidth = Math.Min(blockWidth, width - i);
|
||||||
int decompressedHeight = Math.Min(blockHeight, height - j);
|
int decompressedHeight = Math.Min(blockHeight, height - j);
|
||||||
|
|
||||||
int baseOffset = mipOffset + (j * width + i) * 4;
|
int baseOffset = mipOffset + k * sliceSize + (j * width + i) * 4;
|
||||||
|
|
||||||
for (int jj = 0; jj < decompressedHeight; jj++)
|
for (int jj = 0; jj < decompressedHeight; jj++)
|
||||||
{
|
{
|
||||||
|
@ -116,10 +107,11 @@ namespace Ryujinx.Graphics.Texture.Astc
|
||||||
blockIndex++;
|
blockIndex++;
|
||||||
}
|
}
|
||||||
|
|
||||||
mipOffset += width * height * 4;
|
mipOffset += sliceSize * depth;
|
||||||
|
|
||||||
width = Math.Max(1, width >> 1);
|
width = Math.Max(1, width >> 1);
|
||||||
height = Math.Max(1, height >> 1);
|
height = Math.Max(1, height >> 1);
|
||||||
|
depth = Math.Max(1, depth >> 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
decoded = outputStream.ToArray();
|
decoded = outputStream.ToArray();
|
||||||
|
|
Loading…
Reference in a new issue