aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Graphics/Graphics3d/Texture
diff options
context:
space:
mode:
authorgdk <gab.dark.100@gmail.com>2019-10-13 03:02:07 -0300
committerThog <thog@protonmail.com>2020-01-09 02:13:00 +0100
commit1876b346fea647e8284a66bb6d62c38801035cff (patch)
tree6eeff094298cda84d1613dc5ec0691e51d7b35f1 /Ryujinx.Graphics/Graphics3d/Texture
parentf617fb542a0e3d36012d77a4b5acbde7b08902f2 (diff)
Initial work
Diffstat (limited to 'Ryujinx.Graphics/Graphics3d/Texture')
-rw-r--r--Ryujinx.Graphics/Graphics3d/Texture/AstcDecoder.cs1385
-rw-r--r--Ryujinx.Graphics/Graphics3d/Texture/AstcPixel.cs138
-rw-r--r--Ryujinx.Graphics/Graphics3d/Texture/BitArrayStream.cs121
-rw-r--r--Ryujinx.Graphics/Graphics3d/Texture/BlockLinearSwizzle.cs186
-rw-r--r--Ryujinx.Graphics/Graphics3d/Texture/ISwizzle.cs13
-rw-r--r--Ryujinx.Graphics/Graphics3d/Texture/ImageUtils.cs561
-rw-r--r--Ryujinx.Graphics/Graphics3d/Texture/IntegerEncoded.cs269
-rw-r--r--Ryujinx.Graphics/Graphics3d/Texture/LinearSwizzle.cs45
-rw-r--r--Ryujinx.Graphics/Graphics3d/Texture/TextureFactory.cs166
-rw-r--r--Ryujinx.Graphics/Graphics3d/Texture/TextureHelper.cs53
-rw-r--r--Ryujinx.Graphics/Graphics3d/Texture/TextureSwizzle.cs11
11 files changed, 0 insertions, 2948 deletions
diff --git a/Ryujinx.Graphics/Graphics3d/Texture/AstcDecoder.cs b/Ryujinx.Graphics/Graphics3d/Texture/AstcDecoder.cs
deleted file mode 100644
index 3e68be7d..00000000
--- a/Ryujinx.Graphics/Graphics3d/Texture/AstcDecoder.cs
+++ /dev/null
@@ -1,1385 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-
-namespace Ryujinx.Graphics.Texture
-{
- public class AstcDecoderException : Exception
- {
- public AstcDecoderException(string exMsg) : base(exMsg) { }
- }
-
- // https://github.com/GammaUNC/FasTC/blob/master/ASTCEncoder/src/Decompressor.cpp
- public static class AstcDecoder
- {
- struct TexelWeightParams
- {
- public int Width;
- public int Height;
- public bool DualPlane;
- public int MaxWeight;
- public bool Error;
- public bool VoidExtentLdr;
- public bool VoidExtentHdr;
-
- public int GetPackedBitSize()
- {
- // How many indices do we have?
- int indices = Height * Width;
-
- if (DualPlane)
- {
- indices *= 2;
- }
-
- IntegerEncoded intEncoded = IntegerEncoded.CreateEncoding(MaxWeight);
-
- return intEncoded.GetBitLength(indices);
- }
-
- public int GetNumWeightValues()
- {
- int ret = Width * Height;
-
- if (DualPlane)
- {
- ret *= 2;
- }
-
- return ret;
- }
- }
-
- public static byte[] DecodeToRgba8888(
- byte[] inputBuffer,
- int blockX,
- int blockY,
- int blockZ,
- int x,
- int y,
- int z)
- {
- using (MemoryStream inputStream = new MemoryStream(inputBuffer))
- {
- BinaryReader binReader = new BinaryReader(inputStream);
-
- if (blockX > 12 || blockY > 12)
- {
- throw new AstcDecoderException("Block size unsupported!");
- }
-
- if (blockZ != 1 || z != 1)
- {
- // TODO: Support 3D textures?
- throw new AstcDecoderException("3D compressed textures unsupported!");
- }
-
- using (MemoryStream outputStream = new MemoryStream())
- {
- int blockIndex = 0;
-
- for (int j = 0; j < y; j += blockY)
- {
- for (int i = 0; i < x; i += blockX)
- {
- int[] decompressedData = new int[144];
-
- DecompressBlock(binReader.ReadBytes(0x10), decompressedData, blockX, blockY);
-
- int decompressedWidth = Math.Min(blockX, x - i);
- int decompressedHeight = Math.Min(blockY, y - j);
- int baseOffsets = (j * x + i) * 4;
-
- for (int jj = 0; jj < decompressedHeight; jj++)
- {
- outputStream.Seek(baseOffsets + jj * x * 4, SeekOrigin.Begin);
-
- byte[] outputBuffer = new byte[decompressedData.Length * sizeof(int)];
- Buffer.BlockCopy(decompressedData, 0, outputBuffer, 0, outputBuffer.Length);
-
- outputStream.Write(outputBuffer, jj * blockX * 4, decompressedWidth * 4);
- }
-
- blockIndex++;
- }
- }
-
- return outputStream.ToArray();
- }
- }
- }
-
- public static bool DecompressBlock(
- byte[] inputBuffer,
- int[] outputBuffer,
- int blockWidth,
- int blockHeight)
- {
- BitArrayStream bitStream = new BitArrayStream(new BitArray(inputBuffer));
- TexelWeightParams texelParams = DecodeBlockInfo(bitStream);
-
- if (texelParams.Error)
- {
- throw new AstcDecoderException("Invalid block mode");
- }
-
- if (texelParams.VoidExtentLdr)
- {
- FillVoidExtentLdr(bitStream, outputBuffer, blockWidth, blockHeight);
-
- return true;
- }
-
- if (texelParams.VoidExtentHdr)
- {
- throw new AstcDecoderException("HDR void extent blocks are unsupported!");
- }
-
- if (texelParams.Width > blockWidth)
- {
- throw new AstcDecoderException("Texel weight grid width should be smaller than block width");
- }
-
- if (texelParams.Height > blockHeight)
- {
- throw new AstcDecoderException("Texel weight grid height should be smaller than block height");
- }
-
- // Read num partitions
- int numberPartitions = bitStream.ReadBits(2) + 1;
- Debug.Assert(numberPartitions <= 4);
-
- if (numberPartitions == 4 && texelParams.DualPlane)
- {
- throw new AstcDecoderException("Dual plane mode is incompatible with four partition blocks");
- }
-
- // Based on the number of partitions, read the color endpoint mode for
- // each partition.
-
- // Determine partitions, partition index, and color endpoint modes
- int planeIndices = -1;
- int partitionIndex;
- uint[] colorEndpointMode = { 0, 0, 0, 0 };
-
- BitArrayStream colorEndpointStream = new BitArrayStream(new BitArray(16 * 8));
-
- // Read extra config data...
- uint baseColorEndpointMode = 0;
-
- if (numberPartitions == 1)
- {
- colorEndpointMode[0] = (uint)bitStream.ReadBits(4);
- partitionIndex = 0;
- }
- else
- {
- partitionIndex = bitStream.ReadBits(10);
- baseColorEndpointMode = (uint)bitStream.ReadBits(6);
- }
-
- uint baseMode = (baseColorEndpointMode & 3);
-
- // Remaining bits are color endpoint data...
- int numberWeightBits = texelParams.GetPackedBitSize();
- int remainingBits = 128 - numberWeightBits - bitStream.Position;
-
- // Consider extra bits prior to texel data...
- uint extraColorEndpointModeBits = 0;
-
- if (baseMode != 0)
- {
- switch (numberPartitions)
- {
- case 2: extraColorEndpointModeBits += 2; break;
- case 3: extraColorEndpointModeBits += 5; break;
- case 4: extraColorEndpointModeBits += 8; break;
- default: Debug.Assert(false); break;
- }
- }
-
- remainingBits -= (int)extraColorEndpointModeBits;
-
- // Do we have a dual plane situation?
- int planeSelectorBits = 0;
-
- if (texelParams.DualPlane)
- {
- planeSelectorBits = 2;
- }
-
- remainingBits -= planeSelectorBits;
-
- // Read color data...
- int colorDataBits = remainingBits;
-
- while (remainingBits > 0)
- {
- int numberBits = Math.Min(remainingBits, 8);
- int bits = bitStream.ReadBits(numberBits);
- colorEndpointStream.WriteBits(bits, numberBits);
- remainingBits -= 8;
- }
-
- // Read the plane selection bits
- planeIndices = bitStream.ReadBits(planeSelectorBits);
-
- // Read the rest of the CEM
- if (baseMode != 0)
- {
- uint extraColorEndpointMode = (uint)bitStream.ReadBits((int)extraColorEndpointModeBits);
- uint tempColorEndpointMode = (extraColorEndpointMode << 6) | baseColorEndpointMode;
- tempColorEndpointMode >>= 2;
-
- bool[] c = new bool[4];
-
- for (int i = 0; i < numberPartitions; i++)
- {
- c[i] = (tempColorEndpointMode & 1) != 0;
- tempColorEndpointMode >>= 1;
- }
-
- byte[] m = new byte[4];
-
- for (int i = 0; i < numberPartitions; i++)
- {
- m[i] = (byte)(tempColorEndpointMode & 3);
- tempColorEndpointMode >>= 2;
- Debug.Assert(m[i] <= 3);
- }
-
- for (int i = 0; i < numberPartitions; i++)
- {
- colorEndpointMode[i] = baseMode;
- if (!(c[i])) colorEndpointMode[i] -= 1;
- colorEndpointMode[i] <<= 2;
- colorEndpointMode[i] |= m[i];
- }
- }
- else if (numberPartitions > 1)
- {
- uint tempColorEndpointMode = baseColorEndpointMode >> 2;
-
- for (uint i = 0; i < numberPartitions; i++)
- {
- colorEndpointMode[i] = tempColorEndpointMode;
- }
- }
-
- // Make sure everything up till here is sane.
- for (int i = 0; i < numberPartitions; i++)
- {
- Debug.Assert(colorEndpointMode[i] < 16);
- }
- Debug.Assert(bitStream.Position + texelParams.GetPackedBitSize() == 128);
-
- // Decode both color data and texel weight data
- int[] colorValues = new int[32]; // Four values * two endpoints * four maximum partitions
- DecodeColorValues(colorValues, colorEndpointStream.ToByteArray(), colorEndpointMode, numberPartitions, colorDataBits);
-
- AstcPixel[][] endPoints = new AstcPixel[4][];
- endPoints[0] = new AstcPixel[2];
- endPoints[1] = new AstcPixel[2];
- endPoints[2] = new AstcPixel[2];
- endPoints[3] = new AstcPixel[2];
-
- int colorValuesPosition = 0;
-
- for (int i = 0; i < numberPartitions; i++)
- {
- ComputeEndpoints(endPoints[i], colorValues, colorEndpointMode[i], ref colorValuesPosition);
- }
-
- // Read the texel weight data.
- byte[] texelWeightData = (byte[])inputBuffer.Clone();
-
- // Reverse everything
- for (int i = 0; i < 8; i++)
- {
- byte a = ReverseByte(texelWeightData[i]);
- byte b = ReverseByte(texelWeightData[15 - i]);
-
- texelWeightData[i] = b;
- texelWeightData[15 - i] = a;
- }
-
- // Make sure that higher non-texel bits are set to zero
- int clearByteStart = (texelParams.GetPackedBitSize() >> 3) + 1;
- texelWeightData[clearByteStart - 1] &= (byte)((1 << (texelParams.GetPackedBitSize() % 8)) - 1);
-
- int cLen = 16 - clearByteStart;
- for (int i = clearByteStart; i < clearByteStart + cLen; i++) texelWeightData[i] = 0;
-
- List<IntegerEncoded> texelWeightValues = new List<IntegerEncoded>();
- BitArrayStream weightBitStream = new BitArrayStream(new BitArray(texelWeightData));
-
- IntegerEncoded.DecodeIntegerSequence(texelWeightValues, weightBitStream, texelParams.MaxWeight, texelParams.GetNumWeightValues());
-
- // Blocks can be at most 12x12, so we can have as many as 144 weights
- int[][] weights = new int[2][];
- weights[0] = new int[144];
- weights[1] = new int[144];
-
- UnquantizeTexelWeights(weights, texelWeightValues, texelParams, blockWidth, blockHeight);
-
- // Now that we have endpoints and weights, we can interpolate and generate
- // the proper decoding...
- for (int j = 0; j < blockHeight; j++)
- {
- for (int i = 0; i < blockWidth; i++)
- {
- int partition = Select2dPartition(partitionIndex, i, j, numberPartitions, ((blockHeight * blockWidth) < 32));
- Debug.Assert(partition < numberPartitions);
-
- AstcPixel pixel = new AstcPixel(0, 0, 0, 0);
- for (int component = 0; component < 4; component++)
- {
- int component0 = endPoints[partition][0].GetComponent(component);
- component0 = BitArrayStream.Replicate(component0, 8, 16);
- int component1 = endPoints[partition][1].GetComponent(component);
- component1 = BitArrayStream.Replicate(component1, 8, 16);
-
- int plane = 0;
-
- if (texelParams.DualPlane && (((planeIndices + 1) & 3) == component))
- {
- plane = 1;
- }
-
- int weight = weights[plane][j * blockWidth + i];
- int finalComponent = (component0 * (64 - weight) + component1 * weight + 32) / 64;
-
- if (finalComponent == 65535)
- {
- pixel.SetComponent(component, 255);
- }
- else
- {
- double finalComponentFloat = finalComponent;
- pixel.SetComponent(component, (int)(255.0 * (finalComponentFloat / 65536.0) + 0.5));
- }
- }
-
- outputBuffer[j * blockWidth + i] = pixel.Pack();
- }
- }
-
- return true;
- }
-
- private static int Select2dPartition(int seed, int x, int y, int partitionCount, bool isSmallBlock)
- {
- return SelectPartition(seed, x, y, 0, partitionCount, isSmallBlock);
- }
-
- private static int SelectPartition(int seed, int x, int y, int z, int partitionCount, bool isSmallBlock)
- {
- if (partitionCount == 1)
- {
- return 0;
- }
-
- if (isSmallBlock)
- {
- x <<= 1;
- y <<= 1;
- z <<= 1;
- }
-
- seed += (partitionCount - 1) * 1024;
-
- int rightNum = Hash52((uint)seed);
- byte seed01 = (byte)(rightNum & 0xF);
- byte seed02 = (byte)((rightNum >> 4) & 0xF);
- byte seed03 = (byte)((rightNum >> 8) & 0xF);
- byte seed04 = (byte)((rightNum >> 12) & 0xF);
- byte seed05 = (byte)((rightNum >> 16) & 0xF);
- byte seed06 = (byte)((rightNum >> 20) & 0xF);
- byte seed07 = (byte)((rightNum >> 24) & 0xF);
- byte seed08 = (byte)((rightNum >> 28) & 0xF);
- byte seed09 = (byte)((rightNum >> 18) & 0xF);
- byte seed10 = (byte)((rightNum >> 22) & 0xF);
- byte seed11 = (byte)((rightNum >> 26) & 0xF);
- byte seed12 = (byte)(((rightNum >> 30) | (rightNum << 2)) & 0xF);
-
- seed01 *= seed01; seed02 *= seed02;
- seed03 *= seed03; seed04 *= seed04;
- seed05 *= seed05; seed06 *= seed06;
- seed07 *= seed07; seed08 *= seed08;
- seed09 *= seed09; seed10 *= seed10;
- seed11 *= seed11; seed12 *= seed12;
-
- int seedHash1, seedHash2, seedHash3;
-
- if ((seed & 1) != 0)
- {
- seedHash1 = (seed & 2) != 0 ? 4 : 5;
- seedHash2 = (partitionCount == 3) ? 6 : 5;
- }
- else
- {
- seedHash1 = (partitionCount == 3) ? 6 : 5;
- seedHash2 = (seed & 2) != 0 ? 4 : 5;
- }
-
- seedHash3 = (seed & 0x10) != 0 ? seedHash1 : seedHash2;
-
- seed01 >>= seedHash1; seed02 >>= seedHash2; seed03 >>= seedHash1; seed04 >>= seedHash2;
- seed05 >>= seedHash1; seed06 >>= seedHash2; seed07 >>= seedHash1; seed08 >>= seedHash2;
- seed09 >>= seedHash3; seed10 >>= seedHash3; seed11 >>= seedHash3; seed12 >>= seedHash3;
-
- int a = seed01 * x + seed02 * y + seed11 * z + (rightNum >> 14);
- int b = seed03 * x + seed04 * y + seed12 * z + (rightNum >> 10);
- int c = seed05 * x + seed06 * y + seed09 * z + (rightNum >> 6);
- int d = seed07 * x + seed08 * y + seed10 * z + (rightNum >> 2);
-
- a &= 0x3F; b &= 0x3F; c &= 0x3F; d &= 0x3F;
-
- if (partitionCount < 4) d = 0;
- if (partitionCount < 3) c = 0;
-
- if (a >= b && a >= c && a >= d) return 0;
- else if (b >= c && b >= d) return 1;
- else if (c >= d) return 2;
- return 3;
- }
-
- static int Hash52(uint val)
- {
- val ^= val >> 15; val -= val << 17; val += val << 7; val += val << 4;
- val ^= val >> 5; val += val << 16; val ^= val >> 7; val ^= val >> 3;
- val ^= val << 6; val ^= val >> 17;
-
- return (int)val;
- }
-
- static void UnquantizeTexelWeights(
- int[][] outputBuffer,
- List<IntegerEncoded> weights,
- TexelWeightParams texelParams,
- int blockWidth,
- int blockHeight)
- {
- int weightIndices = 0;
- int[][] unquantized = new int[2][];
- unquantized[0] = new int[144];
- unquantized[1] = new int[144];
-
- for (int i = 0; i < weights.Count; i++)
- {
- unquantized[0][weightIndices] = UnquantizeTexelWeight(weights[i]);
-
- if (texelParams.DualPlane)
- {
- i++;
- unquantized[1][weightIndices] = UnquantizeTexelWeight(weights[i]);
-
- if (i == weights.Count)
- {
- break;
- }
- }
-
- if (++weightIndices >= (texelParams.Width * texelParams.Height)) break;
- }
-
- // Do infill if necessary (Section C.2.18) ...
- int ds = (1024 + (blockWidth / 2)) / (blockWidth - 1);
- int dt = (1024 + (blockHeight / 2)) / (blockHeight - 1);
-
- int planeScale = texelParams.DualPlane ? 2 : 1;
-
- for (int plane = 0; plane < planeScale; plane++)
- {
- for (int t = 0; t < blockHeight; t++)
- {
- for (int s = 0; s < blockWidth; s++)
- {
- int cs = ds * s;
- int ct = dt * t;
-
- int gs = (cs * (texelParams.Width - 1) + 32) >> 6;
- int gt = (ct * (texelParams.Height - 1) + 32) >> 6;
-
- int js = gs >> 4;
- int fs = gs & 0xF;
-
- int jt = gt >> 4;
- int ft = gt & 0x0F;
-
- int w11 = (fs * ft + 8) >> 4;
- int w10 = ft - w11;
- int w01 = fs - w11;
- int w00 = 16 - fs - ft + w11;
-
- int v0 = js + jt * texelParams.Width;
-
- int p00 = 0;
- int p01 = 0;
- int p10 = 0;
- int p11 = 0;
-
- if (v0 < (texelParams.Width * texelParams.Height))
- {
- p00 = unquantized[plane][v0];
- }
-
- if (v0 + 1 < (texelParams.Width * texelParams.Height))
- {
- p01 = unquantized[plane][v0 + 1];
- }
-
- if (v0 + texelParams.Width < (texelParams.Width * texelParams.Height))
- {
- p10 = unquantized[plane][v0 + texelParams.Width];
- }
-
- if (v0 + texelParams.Width + 1 < (texelParams.Width * texelParams.Height))
- {
- p11 = unquantized[plane][v0 + texelParams.Width + 1];
- }
-
- outputBuffer[plane][t * blockWidth + s] = (p00 * w00 + p01 * w01 + p10 * w10 + p11 * w11 + 8) >> 4;
- }
- }
- }
- }
-
- static int UnquantizeTexelWeight(IntegerEncoded intEncoded)
- {
- int bitValue = intEncoded.BitValue;
- int bitLength = intEncoded.NumberBits;
-
- int a = BitArrayStream.Replicate(bitValue & 1, 1, 7);
- int b = 0, c = 0, d = 0;
-
- int result = 0;
-
- switch (intEncoded.GetEncoding())
- {
- case IntegerEncoded.EIntegerEncoding.JustBits:
- result = BitArrayStream.Replicate(bitValue, bitLength, 6);
- break;
-
- case IntegerEncoded.EIntegerEncoding.Trit:
- {
- d = intEncoded.TritValue;
- Debug.Assert(d < 3);
-
- switch (bitLength)
- {
- case 0:
- {
- int[] results = { 0, 32, 63 };
- result = results[d];
-
- break;
- }
-
- case 1:
- {
- c = 50;
- break;
- }
-
- case 2:
- {
- c = 23;
- int b2 = (bitValue >> 1) & 1;
- b = (b2 << 6) | (b2 << 2) | b2;
-
- break;
- }
-
- case 3:
- {
- c = 11;
- int cb = (bitValue >> 1) & 3;
- b = (cb << 5) | cb;
-
- break;
- }
-
- default:
- throw new AstcDecoderException("Invalid trit encoding for texel weight");
- }
-
- break;
- }
-
- case IntegerEncoded.EIntegerEncoding.Quint:
- {
- d = intEncoded.QuintValue;
- Debug.Assert(d < 5);
-
- switch (bitLength)
- {
- case 0:
- {
- int[] results = { 0, 16, 32, 47, 63 };
- result = results[d];
-
- break;
- }
-
- case 1:
- {
- c = 28;
-
- break;
- }
-
- case 2:
- {
- c = 13;
- int b2 = (bitValue >> 1) & 1;
- b = (b2 << 6) | (b2 << 1);
-
- break;
- }
-
- default:
- throw new AstcDecoderException("Invalid quint encoding for texel weight");
- }
-
- break;
- }
- }
-
- if (intEncoded.GetEncoding() != IntegerEncoded.EIntegerEncoding.JustBits && bitLength > 0)
- {
- // Decode the value...
- result = d * c + b;
- result ^= a;
- result = (a & 0x20) | (result >> 2);
- }
-
- Debug.Assert(result < 64);
-
- // Change from [0,63] to [0,64]
- if (result > 32)
- {
- result += 1;
- }
-
- return result;
- }
-
- static byte ReverseByte(byte b)
- {
- // Taken from http://graphics.stanford.edu/~seander/bithacks.html#ReverseByteWith64Bits
- return (byte)((((b) * 0x80200802L) & 0x0884422110L) * 0x0101010101L >> 32);
- }
-
- static uint[] ReadUintColorValues(int number, int[] colorValues, ref int colorValuesPosition)
- {
- uint[] ret = new uint[number];
-
- for (int i = 0; i < number; i++)
- {
- ret[i] = (uint)colorValues[colorValuesPosition++];
- }
-
- return ret;
- }
-
- static int[] ReadIntColorValues(int number, int[] colorValues, ref int colorValuesPosition)
- {
- int[] ret = new int[number];
-
- for (int i = 0; i < number; i++)
- {
- ret[i] = colorValues[colorValuesPosition++];
- }
-
- return ret;
- }
-
- static void ComputeEndpoints(
- AstcPixel[] endPoints,
- int[] colorValues,
- uint colorEndpointMode,
- ref int colorValuesPosition)
- {
- switch (colorEndpointMode)
- {
- case 0:
- {
- uint[] val = ReadUintColorValues(2, colorValues, ref colorValuesPosition);
-
- endPoints[0] = new AstcPixel(0xFF, (short)val[0], (short)val[0], (short)val[0]);
- endPoints[1] = new AstcPixel(0xFF, (short)val[1], (short)val[1], (short)val[1]);
-
- break;
- }
-
-
- case 1:
- {
- uint[] val = ReadUintColorValues(2, colorValues, ref colorValuesPosition);
- int l0 = (int)((val[0] >> 2) | (val[1] & 0xC0));
- int l1 = (int)Math.Max(l0 + (val[1] & 0x3F), 0xFFU);
-
- endPoints[0] = new AstcPixel(0xFF, (short)l0, (short)l0, (short)l0);
- endPoints[1] = new AstcPixel(0xFF, (short)l1, (short)l1, (short)l1);
-
- break;
- }
-
- case 4:
- {
- uint[] val = ReadUintColorValues(4, colorValues, ref colorValuesPosition);
-
- endPoints[0] = new AstcPixel((short)val[2], (short)val[0], (short)val[0], (short)val[0]);
- endPoints[1] = new AstcPixel((short)val[3], (short)val[1], (short)val[1], (short)val[1]);
-
- break;
- }
-
- case 5:
- {
- int[] val = ReadIntColorValues(4, colorValues, ref colorValuesPosition);
-
- BitArrayStream.BitTransferSigned(ref val[1], ref val[0]);
- BitArrayStream.BitTransferSigned(ref val[3], ref val[2]);
-
- endPoints[0] = new AstcPixel((short)val[2], (short)val[0], (short)val[0], (short)val[0]);
- endPoints[1] = new AstcPixel((short)(val[2] + val[3]), (short)(val[0] + val[1]), (short)(val[0] + val[1]), (short)(val[0] + val[1]));
-
- endPoints[0].ClampByte();
- endPoints[1].ClampByte();
-
- break;
- }
-
- case 6:
- {
- uint[] val = ReadUintColorValues(4, colorValues, ref colorValuesPosition);
-
- endPoints[0] = new AstcPixel(0xFF, (short)(val[0] * val[3] >> 8), (short)(val[1] * val[3] >> 8), (short)(val[2] * val[3] >> 8));
- endPoints[1] = new AstcPixel(0xFF, (short)val[0], (short)val[1], (short)val[2]);
-
- break;
- }
-
- case 8:
- {
- uint[] val = ReadUintColorValues(6, colorValues, ref colorValuesPosition);
-
- if (val[1] + val[3] + val[5] >= val[0] + val[2] + val[4])
- {
- endPoints[0] = new AstcPixel(0xFF, (short)val[0], (short)val[2], (short)val[4]);
- endPoints[1] = new AstcPixel(0xFF, (short)val[1], (short)val[3], (short)val[5]);
- }
- else
- {
- endPoints[0] = AstcPixel.BlueContract(0xFF, (short)val[1], (short)val[3], (short)val[5]);
- endPoints[1] = AstcPixel.BlueContract(0xFF, (short)val[0], (short)val[2], (short)val[4]);
- }
-
- break;
- }
-
- case 9:
- {
- int[] val = ReadIntColorValues(6, colorValues, ref colorValuesPosition);
-
- BitArrayStream.BitTransferSigned(ref val[1], ref val[0]);
- BitArrayStream.BitTransferSigned(ref val[3], ref val[2]);
- BitArrayStream.BitTransferSigned(ref val[5], ref val[4]);
-
- if (val[1] + val[3] + val[5] >= 0)
- {
- endPoints[0] = new AstcPixel(0xFF, (short)val[0], (short)val[2], (short)val[4]);
- endPoints[1] = new AstcPixel(0xFF, (short)(val[0] + val[1]), (short)(val[2] + val[3]), (short)(val[4] + val[5]));
- }
- else
- {
- endPoints[0] = AstcPixel.BlueContract(0xFF, val[0] + val[1], val[2] + val[3], val[4] + val[5]);
- endPoints[1] = AstcPixel.BlueContract(0xFF, val[0], val[2], val[4]);
- }
-
- endPoints[0].ClampByte();
- endPoints[1].ClampByte();
-
- break;
- }
-
- case 10:
- {
- uint[] val = ReadUintColorValues(6, colorValues, ref colorValuesPosition);
-
- endPoints[0] = new AstcPixel((short)val[4], (short)(val[0] * val[3] >> 8), (short)(val[1] * val[3] >> 8), (short)(val[2] * val[3] >> 8));
- endPoints[1] = new AstcPixel((short)val[5], (short)val[0], (short)val[1], (short)val[2]);
-
- break;
- }
-
- case 12:
- {
- uint[] val = ReadUintColorValues(8, colorValues, ref colorValuesPosition);
-
- if (val[1] + val[3] + val[5] >= val[0] + val[2] + val[4])
- {
- endPoints[0] = new AstcPixel((short)val[6], (short)val[0], (short)val[2], (short)val[4]);
- endPoints[1] = new AstcPixel((short)val[7], (short)val[1], (short)val[3], (short)val[5]);
- }
- else
- {
- endPoints[0] = AstcPixel.BlueContract((short)val[7], (short)val[1], (short)val[3], (short)val[5]);
- endPoints[1] = AstcPixel.BlueContract((short)val[6], (short)val[0], (short)val[2], (short)val[4]);
- }
-
- break;
- }
-
- case 13:
- {
- int[] val = ReadIntColorValues(8, colorValues, ref colorValuesPosition);
-
- BitArrayStream.BitTransferSigned(ref val[1], ref val[0]);
- BitArrayStream.BitTransferSigned(ref val[3], ref val[2]);
- BitArrayStream.BitTransferSigned(ref val[5], ref val[4]);
- BitArrayStream.BitTransferSigned(ref val[7], ref val[6]);
-
- if (val[1] + val[3] + val[5] >= 0)
- {
- endPoints[0] = new AstcPixel((short)val[6], (short)val[0], (short)val[2], (short)val[4]);
- endPoints[1] = new AstcPixel((short)(val[7] + val[6]), (short)(val[0] + val[1]), (short)(val[2] + val[3]), (short)(val[4] + val[5]));
- }
- else
- {
- endPoints[0] = AstcPixel.BlueContract(val[6] + val[7], val[0] + val[1], val[2] + val[3], val[4] + val[5]);
- endPoints[1] = AstcPixel.BlueContract(val[6], val[0], val[2], val[4]);
- }
-
- endPoints[0].ClampByte();
- endPoints[1].ClampByte();
-
- break;
- }
-
- default:
- throw new AstcDecoderException("Unsupported color endpoint mode (is it HDR?)");
- }
- }
-
- static void DecodeColorValues(
- int[] outputValues,
- byte[] inputData,
- uint[] modes,
- int numberPartitions,
- int numberBitsForColorData)
- {
- // First figure out how many color values we have
- int numberValues = 0;
-
- for (int i = 0; i < numberPartitions; i++)
- {
- numberValues += (int)((modes[i] >> 2) + 1) << 1;
- }
-
- // Then based on the number of values and the remaining number of bits,
- // figure out the max value for each of them...
- int range = 256;
-
- while (--range > 0)
- {
- IntegerEncoded intEncoded = IntegerEncoded.CreateEncoding(range);
- int bitLength = intEncoded.GetBitLength(numberValues);
-
- if (bitLength <= numberBitsForColorData)
- {
- // Find the smallest possible range that matches the given encoding
- while (--range > 0)
- {
- IntegerEncoded newIntEncoded = IntegerEncoded.CreateEncoding(range);
- if (!newIntEncoded.MatchesEncoding(intEncoded))
- {
- break;
- }
- }
-
- // Return to last matching range.
- range++;
- break;
- }
- }
-
- // We now have enough to decode our integer sequence.
- List<IntegerEncoded> integerEncodedSequence = new List<IntegerEncoded>();
- BitArrayStream colorBitStream = new BitArrayStream(new BitArray(inputData));
-
- IntegerEncoded.DecodeIntegerSequence(integerEncodedSequence, colorBitStream, range, numberValues);
-
- // Once we have the decoded values, we need to dequantize them to the 0-255 range
- // This procedure is outlined in ASTC spec C.2.13
- int outputIndices = 0;
-
- foreach (IntegerEncoded intEncoded in integerEncodedSequence)
- {
- int bitLength = intEncoded.NumberBits;
- int bitValue = intEncoded.BitValue;
-
- Debug.Assert(bitLength >= 1);
-
- int a = 0, b = 0, c = 0, d = 0;
- // A is just the lsb replicated 9 times.
- a = BitArrayStream.Replicate(bitValue & 1, 1, 9);
-
- switch (intEncoded.GetEncoding())
- {
- case IntegerEncoded.EIntegerEncoding.JustBits:
- {
- outputValues[outputIndices++] = BitArrayStream.Replicate(bitValue, bitLength, 8);
-
- break;
- }
-
- case IntegerEncoded.EIntegerEncoding.Trit:
- {
- d = intEncoded.TritValue;
-
- switch (bitLength)
- {
- case 1:
- {
- c = 204;
-
- break;
- }
-
- case 2:
- {
- c = 93;
- // B = b000b0bb0
- int b2 = (bitValue >> 1) & 1;
- b = (b2 << 8) | (b2 << 4) | (b2 << 2) | (b2 << 1);
-
- break;
- }
-
- case 3:
- {
- c = 44;
- // B = cb000cbcb
- int cb = (bitValue >> 1) & 3;
- b = (cb << 7) | (cb << 2) | cb;
-
- break;
- }
-
-
- case 4:
- {
- c = 22;
- // B = dcb000dcb
- int dcb = (bitValue >> 1) & 7;
- b = (dcb << 6) | dcb;
-
- break;
- }
-
- case 5:
- {
- c = 11;
- // B = edcb000ed
- int edcb = (bitValue >> 1) & 0xF;
- b = (edcb << 5) | (edcb >> 2);
-
- break;
- }
-
- case 6:
- {
- c = 5;
- // B = fedcb000f
- int fedcb = (bitValue >> 1) & 0x1F;
- b = (fedcb << 4) | (fedcb >> 4);
-
- break;
- }
-
- default:
- throw new AstcDecoderException("Unsupported trit encoding for color values!");
- }
-
- break;
- }
-
- case IntegerEncoded.EIntegerEncoding.Quint:
- {
- d = intEncoded.QuintValue;
-
- switch (bitLength)
- {
- case 1:
- {
- c = 113;
-
- break;
- }
-
- case 2:
- {
- c = 54;
- // B = b0000bb00
- int b2 = (bitValue >> 1) & 1;
- b = (b2 << 8) | (b2 << 3) | (b2 << 2);
-
- break;
- }
-
- case 3:
- {
- c = 26;
- // B = cb0000cbc
- int cb = (bitValue >> 1) & 3;
- b = (cb << 7) | (cb << 1) | (cb >> 1);
-
- break;
- }
-
- case 4:
- {
- c = 13;
- // B = dcb0000dc
- int dcb = (bitValue >> 1) & 7;
- b = (dcb << 6) | (dcb >> 1);
-
- break;
- }
-
- case 5:
- {
- c = 6;
- // B = edcb0000e
- int edcb = (bitValue >> 1) & 0xF;
- b = (edcb << 5) | (edcb >> 3);
-
- break;
- }
-
- default:
- throw new AstcDecoderException("Unsupported quint encoding for color values!");
- }
- break;
- }
- }
-
- if (intEncoded.GetEncoding() != IntegerEncoded.EIntegerEncoding.JustBits)
- {
- int T = d * c + b;
- T ^= a;
- T = (a & 0x80) | (T >> 2);
-
- outputValues[outputIndices++] = T;
- }
- }
-
- // Make sure that each of our values is in the proper range...
- for (int i = 0; i < numberValues; i++)
- {
- Debug.Assert(outputValues[i] <= 255);
- }
- }
-
- static void FillVoidExtentLdr(BitArrayStream bitStream, int[] outputBuffer, int blockWidth, int blockHeight)
- {
- // Don't actually care about the void extent, just read the bits...
- for (int i = 0; i < 4; ++i)
- {
- bitStream.ReadBits(13);
- }
-
- // Decode the RGBA components and renormalize them to the range [0, 255]
- ushort r = (ushort)bitStream.ReadBits(16);
- ushort g = (ushort)bitStream.ReadBits(16);
- ushort b = (ushort)bitStream.ReadBits(16);
- ushort a = (ushort)bitStream.ReadBits(16);
-
- int rgba = (r >> 8) | (g & 0xFF00) | ((b) & 0xFF00) << 8 | ((a) & 0xFF00) << 16;
-
- for (int j = 0; j < blockHeight; j++)
- {
- for (int i = 0; i < blockWidth; i++)
- {
- outputBuffer[j * blockWidth + i] = rgba;
- }
- }
- }
-
- static TexelWeightParams DecodeBlockInfo(BitArrayStream bitStream)
- {
- TexelWeightParams texelParams = new TexelWeightParams();
-
- // Read the entire block mode all at once
- ushort modeBits = (ushort)bitStream.ReadBits(11);
-
- // Does this match the void extent block mode?
- if ((modeBits & 0x01FF) == 0x1FC)
- {
- if ((modeBits & 0x200) != 0)
- {
- texelParams.VoidExtentHdr = true;
- }
- else
- {
- texelParams.VoidExtentLdr = true;
- }
-
- // Next two bits must be one.
- if ((modeBits & 0x400) == 0 || bitStream.ReadBits(1) == 0)
- {
- texelParams.Error = true;
- }
-
- return texelParams;
- }
-
- // First check if the last four bits are zero
- if ((modeBits & 0xF) == 0)
- {
- texelParams.Error = true;
- return texelParams;
- }
-
- // If the last two bits are zero, then if bits
- // [6-8] are all ones, this is also reserved.
- if ((modeBits & 0x3) == 0 && (modeBits & 0x1C0) == 0x1C0)
- {
- texelParams.Error = true;
-
- return texelParams;
- }
-
- // Otherwise, there is no error... Figure out the layout
- // of the block mode. Layout is determined by a number
- // between 0 and 9 corresponding to table C.2.8 of the
- // ASTC spec.
- int layout = 0;
-
- if ((modeBits & 0x1) != 0 || (modeBits & 0x2) != 0)
- {
- // layout is in [0-4]
- if ((modeBits & 0x8) != 0)
- {
- // layout is in [2-4]
- if ((modeBits & 0x4) != 0)
- {
- // layout is in [3-4]
- if ((modeBits & 0x100) != 0)
- {
- layout = 4;
- }
- else
- {
- layout = 3;
- }
- }
- else
- {
- layout = 2;
- }
- }
- else
- {
- // layout is in [0-1]
- if ((modeBits & 0x4) != 0)
- {
- layout = 1;
- }
- else
- {
- layout = 0;
- }
- }
- }
- else
- {
- // layout is in [5-9]
- if ((modeBits & 0x100) != 0)
- {
- // layout is in [7-9]
- if ((modeBits & 0x80) != 0)
- {
- // layout is in [7-8]
- Debug.Assert((modeBits & 0x40) == 0);
-
- if ((modeBits & 0x20) != 0)
- {
- layout = 8;
- }
- else
- {
- layout = 7;
- }
- }
- else
- {
- layout = 9;
- }
- }
- else
- {
- // layout is in [5-6]
- if ((modeBits & 0x80) != 0)
- {
- layout = 6;
- }
- else
- {
- layout = 5;
- }
- }
- }
-
- Debug.Assert(layout < 10);
-
- // Determine R
- int r = (modeBits >> 4) & 1;
- if (layout < 5)
- {
- r |= (modeBits & 0x3) << 1;
- }
- else
- {
- r |= (modeBits & 0xC) >> 1;
- }
-
- Debug.Assert(2 <= r && r <= 7);
-
- // Determine width & height
- switch (layout)
- {
- case 0:
- {
- int a = (modeBits >> 5) & 0x3;
- int b = (modeBits >> 7) & 0x3;
-
- texelParams.Width = b + 4;
- texelParams.Height = a + 2;
-
- break;
- }
-
- case 1:
- {
- int a = (modeBits >> 5) & 0x3;
- int b = (modeBits >> 7) & 0x3;
-
- texelParams.Width = b + 8;
- texelParams.Height = a + 2;
-
- break;
- }
-
- case 2:
- {
- int a = (modeBits >> 5) & 0x3;
- int b = (modeBits >> 7) & 0x3;
-
- texelParams.Width = a + 2;
- texelParams.Height = b + 8;
-
- break;
- }
-
- case 3:
- {
- int a = (modeBits >> 5) & 0x3;
- int b = (modeBits >> 7) & 0x1;
-
- texelParams.Width = a + 2;
- texelParams.Height = b + 6;
-
- break;
- }
-
- case 4:
- {
- int a = (modeBits >> 5) & 0x3;
- int b = (modeBits >> 7) & 0x1;
-
- texelParams.Width = b + 2;
- texelParams.Height = a + 2;
-
- break;
- }
-
- case 5:
- {
- int a = (modeBits >> 5) & 0x3;
-
- texelParams.Width = 12;
- texelParams.Height = a + 2;
-
- break;
- }
-
- case 6:
- {
- int a = (modeBits >> 5) & 0x3;
-
- texelParams.Width = a + 2;
- texelParams.Height = 12;
-
- break;
- }
-
- case 7:
- {
- texelParams.Width = 6;
- texelParams.Height = 10;
-
- break;
- }
-
- case 8:
- {
- texelParams.Width = 10;
- texelParams.Height = 6;
- break;
- }
-
- case 9:
- {
- int a = (modeBits >> 5) & 0x3;
- int b = (modeBits >> 9) & 0x3;
-
- texelParams.Width = a + 6;
- texelParams.Height = b + 6;
-
- break;
- }
-
- default:
- // Don't know this layout...
- texelParams.Error = true;
- break;
- }
-
- // Determine whether or not we're using dual planes
- // and/or high precision layouts.
- bool d = ((layout != 9) && ((modeBits & 0x400) != 0));
- bool h = (layout != 9) && ((modeBits & 0x200) != 0);
-
- if (h)
- {
- int[] maxWeights = { 9, 11, 15, 19, 23, 31 };
- texelParams.MaxWeight = maxWeights[r - 2];
- }
- else
- {
- int[] maxWeights = { 1, 2, 3, 4, 5, 7 };
- texelParams.MaxWeight = maxWeights[r - 2];
- }
-
- texelParams.DualPlane = d;
-
- return texelParams;
- }
- }
-}
diff --git a/Ryujinx.Graphics/Graphics3d/Texture/AstcPixel.cs b/Ryujinx.Graphics/Graphics3d/Texture/AstcPixel.cs
deleted file mode 100644
index 2f73c62b..00000000
--- a/Ryujinx.Graphics/Graphics3d/Texture/AstcPixel.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-using System;
-using System.Diagnostics;
-
-namespace Ryujinx.Graphics.Texture
-{
- class AstcPixel
- {
- public short R { get; set; }
- public short G { get; set; }
- public short B { get; set; }
- public short A { get; set; }
-
- byte[] _bitDepth = new byte[4];
-
- public AstcPixel(short a, short r, short g, short b)
- {
- A = a;
- R = r;
- G = g;
- B = b;
-
- for (int i = 0; i < 4; i++)
- _bitDepth[i] = 8;
- }
-
- public void ClampByte()
- {
- R = Math.Min(Math.Max(R, (short)0), (short)255);
- G = Math.Min(Math.Max(G, (short)0), (short)255);
- B = Math.Min(Math.Max(B, (short)0), (short)255);
- A = Math.Min(Math.Max(A, (short)0), (short)255);
- }
-
- public short GetComponent(int index)
- {
- switch(index)
- {
- case 0: return A;
- case 1: return R;
- case 2: return G;
- case 3: return B;
- }
-
- return 0;
- }
-
- public void SetComponent(int index, int value)
- {
- switch (index)
- {
- case 0:
- A = (short)value;
- break;
- case 1:
- R = (short)value;
- break;
- case 2:
- G = (short)value;
- break;
- case 3:
- B = (short)value;
- break;
- }
- }
-
- public void ChangeBitDepth(byte[] depth)
- {
- for (int i = 0; i< 4; i++)
- {
- int value = ChangeBitDepth(GetComponent(i), _bitDepth[i], depth[i]);
-
- SetComponent(i, value);
- _bitDepth[i] = depth[i];
- }
- }
-
- short ChangeBitDepth(short value, byte oldDepth, byte newDepth)
- {
- Debug.Assert(newDepth <= 8);
- Debug.Assert(oldDepth <= 8);
-
- if (oldDepth == newDepth)
- {
- // Do nothing
- return value;
- }
- else if (oldDepth == 0 && newDepth != 0)
- {
- return (short)((1 << newDepth) - 1);
- }
- else if (newDepth > oldDepth)
- {
- return (short)BitArrayStream.Replicate(value, oldDepth, newDepth);
- }
- else
- {
- // oldDepth > newDepth
- if (newDepth == 0)
- {
- return 0xFF;
- }
- else
- {
- byte bitsWasted = (byte)(oldDepth - newDepth);
- short tempValue = value;
-
- tempValue = (short)((tempValue + (1 << (bitsWasted - 1))) >> bitsWasted);
- tempValue = Math.Min(Math.Max((short)0, tempValue), (short)((1 << newDepth) - 1));
-
- return (byte)(tempValue);
- }
- }
- }
-
- public int Pack()
- {
- AstcPixel newPixel = new AstcPixel(A, R, G, B);
- byte[] eightBitDepth = { 8, 8, 8, 8 };
-
- newPixel.ChangeBitDepth(eightBitDepth);
-
- return (byte)newPixel.A << 24 |
- (byte)newPixel.B << 16 |
- (byte)newPixel.G << 8 |
- (byte)newPixel.R << 0;
- }
-
- // Adds more precision to the blue channel as described
- // in C.2.14
- public static AstcPixel BlueContract(int a, int r, int g, int b)
- {
- return new AstcPixel((short)(a),
- (short)((r + b) >> 1),
- (short)((g + b) >> 1),
- (short)(b));
- }
- }
-}
diff --git a/Ryujinx.Graphics/Graphics3d/Texture/BitArrayStream.cs b/Ryujinx.Graphics/Graphics3d/Texture/BitArrayStream.cs
deleted file mode 100644
index 24069d72..00000000
--- a/Ryujinx.Graphics/Graphics3d/Texture/BitArrayStream.cs
+++ /dev/null
@@ -1,121 +0,0 @@
-using System;
-using System.Collections;
-
-namespace Ryujinx.Graphics.Texture
-{
- public class BitArrayStream
- {
- public BitArray BitsArray;
-
- public int Position { get; private set; }
-
- public BitArrayStream(BitArray bitArray)
- {
- BitsArray = bitArray;
- Position = 0;
- }
-
- public short ReadBits(int length)
- {
- int retValue = 0;
- for (int i = Position; i < Position + length; i++)
- {
- if (BitsArray[i])
- {
- retValue |= 1 << (i - Position);
- }
- }
-
- Position += length;
- return (short)retValue;
- }
-
- public int ReadBits(int start, int end)
- {
- int retValue = 0;
- for (int i = start; i <= end; i++)
- {
- if (BitsArray[i])
- {
- retValue |= 1 << (i - start);
- }
- }
-
- return retValue;
- }
-
- public int ReadBit(int index)
- {
- return Convert.ToInt32(BitsArray[index]);
- }
-
- public void WriteBits(int value, int length)
- {
- for (int i = Position; i < Position + length; i++)
- {
- BitsArray[i] = ((value >> (i - Position)) & 1) != 0;
- }
-
- Position += length;
- }
-
- public byte[] ToByteArray()
- {
- byte[] retArray = new byte[(BitsArray.Length + 7) / 8];
- BitsArray.CopyTo(retArray, 0);
- return retArray;
- }
-
- public static int Replicate(int value, int numberBits, int toBit)
- {
- if (numberBits == 0) return 0;
- if (toBit == 0) return 0;
-
- int tempValue = value & ((1 << numberBits) - 1);
- int retValue = tempValue;
- int resLength = numberBits;
-
- while (resLength < toBit)
- {
- int comp = 0;
- if (numberBits > toBit - resLength)
- {
- int newShift = toBit - resLength;
- comp = numberBits - newShift;
- numberBits = newShift;
- }
- retValue <<= numberBits;
- retValue |= tempValue >> comp;
- resLength += numberBits;
- }
- return retValue;
- }
-
- public static int PopCnt(int number)
- {
- int counter;
- for (counter = 0; number != 0; counter++)
- {
- number &= number - 1;
- }
- return counter;
- }
-
- public static void Swap<T>(ref T lhs, ref T rhs)
- {
- T temp = lhs;
- lhs = rhs;
- rhs = temp;
- }
-
- // Transfers a bit as described in C.2.14
- public static void BitTransferSigned(ref int a, ref int b)
- {
- b >>= 1;
- b |= a & 0x80;
- a >>= 1;
- a &= 0x3F;
- if ((a & 0x20) != 0) a -= 0x40;
- }
- }
-}
diff --git a/Ryujinx.Graphics/Graphics3d/Texture/BlockLinearSwizzle.cs b/Ryujinx.Graphics/Graphics3d/Texture/BlockLinearSwizzle.cs
deleted file mode 100644
index 682f7d67..00000000
--- a/Ryujinx.Graphics/Graphics3d/Texture/BlockLinearSwizzle.cs
+++ /dev/null
@@ -1,186 +0,0 @@
-using Ryujinx.Common;
-using System;
-
-namespace Ryujinx.Graphics.Texture
-{
- class BlockLinearSwizzle : ISwizzle
- {
- private const int GobWidth = 64;
- private const int GobHeight = 8;
-
- private const int GobSize = GobWidth * GobHeight;
-
- private int _texWidth;
- private int _texHeight;
- private int _texDepth;
- private int _texGobBlockHeight;
- private int _texGobBlockDepth;
- private int _texBpp;
-
- private int _bhMask;
- private int _bdMask;
-
- private int _bhShift;
- private int _bdShift;
- private int _bppShift;
-
- private int _xShift;
-
- private int _robSize;
- private int _sliceSize;
-
- private int _baseOffset;
-
- public BlockLinearSwizzle(
- int width,
- int height,
- int depth,
- int gobBlockHeight,
- int gobBlockDepth,
- int bpp)
- {
- _texWidth = width;
- _texHeight = height;
- _texDepth = depth;
- _texGobBlockHeight = gobBlockHeight;
- _texGobBlockDepth = gobBlockDepth;
- _texBpp = bpp;
-
- _bppShift = BitUtils.CountTrailingZeros32(bpp);
-
- SetMipLevel(0);
- }
-
- public void SetMipLevel(int level)
- {
- _baseOffset = GetMipOffset(level);
-
- int width = Math.Max(1, _texWidth >> level);
- int height = Math.Max(1, _texHeight >> level);
- int depth = Math.Max(1, _texDepth >> level);
-
- GobBlockSizes gbSizes = AdjustGobBlockSizes(height, depth);
-
- _bhMask = gbSizes.Height - 1;
- _bdMask = gbSizes.Depth - 1;
-
- _bhShift = BitUtils.CountTrailingZeros32(gbSizes.Height);
- _bdShift = BitUtils.CountTrailingZeros32(gbSizes.Depth);
-
- _xShift = BitUtils.CountTrailingZeros32(GobSize * gbSizes.Height * gbSizes.Depth);
-
- RobAndSliceSizes gsSizes = GetRobAndSliceSizes(width, height, gbSizes);
-
- _robSize = gsSizes.RobSize;
- _sliceSize = gsSizes.SliceSize;
- }
-
- public int GetImageSize(int mipsCount)
- {
- int size = GetMipOffset(mipsCount);
-
- size = (size + 0x1fff) & ~0x1fff;
-
- return size;
- }
-
- public int GetMipOffset(int level)
- {
- int totalSize = 0;
-
- for (int index = 0; index < level; index++)
- {
- int width = Math.Max(1, _texWidth >> index);
- int height = Math.Max(1, _texHeight >> index);
- int depth = Math.Max(1, _texDepth >> index);
-
- GobBlockSizes gbSizes = AdjustGobBlockSizes(height, depth);
-
- RobAndSliceSizes rsSizes = GetRobAndSliceSizes(width, height, gbSizes);
-
- totalSize += BitUtils.DivRoundUp(depth, gbSizes.Depth) * rsSizes.SliceSize;
- }
-
- return totalSize;
- }
-
- private struct GobBlockSizes
- {
- public int Height;
- public int Depth;
-
- public GobBlockSizes(int gobBlockHeight, int gobBlockDepth)
- {
- Height = gobBlockHeight;
- Depth = gobBlockDepth;
- }
- }
-
- private GobBlockSizes AdjustGobBlockSizes(int height, int depth)
- {
- int gobBlockHeight = _texGobBlockHeight;
- int gobBlockDepth = _texGobBlockDepth;
-
- int pow2Height = BitUtils.Pow2RoundUp(height);
- int pow2Depth = BitUtils.Pow2RoundUp(depth);
-
- while (gobBlockHeight * GobHeight > pow2Height && gobBlockHeight > 1)
- {
- gobBlockHeight >>= 1;
- }
-
- while (gobBlockDepth > pow2Depth && gobBlockDepth > 1)
- {
- gobBlockDepth >>= 1;
- }
-
- return new GobBlockSizes(gobBlockHeight, gobBlockDepth);
- }
-
- private struct RobAndSliceSizes
- {
- public int RobSize;
- public int SliceSize;
-
- public RobAndSliceSizes(int robSize, int sliceSize)
- {
- RobSize = robSize;
- SliceSize = sliceSize;
- }
- }
-
- private RobAndSliceSizes GetRobAndSliceSizes(int width, int height, GobBlockSizes gbSizes)
- {
- int widthInGobs = BitUtils.DivRoundUp(width * _texBpp, GobWidth);
-
- int robSize = GobSize * gbSizes.Height * gbSizes.Depth * widthInGobs;
-
- int sliceSize = BitUtils.DivRoundUp(height, gbSizes.Height * GobHeight) * robSize;
-
- return new RobAndSliceSizes(robSize, sliceSize);
- }
-
- public int GetSwizzleOffset(int x, int y, int z)
- {
- x <<= _bppShift;
-
- int yh = y / GobHeight;
-
- int position = (z >> _bdShift) * _sliceSize + (yh >> _bhShift) * _robSize;
-
- position += (x / GobWidth) << _xShift;
-
- position += (yh & _bhMask) * GobSize;
-
- position += ((z & _bdMask) * GobSize) << _bhShift;
-
- position += ((x & 0x3f) >> 5) << 8;
- position += ((y & 0x07) >> 1) << 6;
- position += ((x & 0x1f) >> 4) << 5;
- position += ((y & 0x01) >> 0) << 4;
- position += ((x & 0x0f) >> 0) << 0;
-
- return _baseOffset + position;
- }
- }
-} \ No newline at end of file
diff --git a/Ryujinx.Graphics/Graphics3d/Texture/ISwizzle.cs b/Ryujinx.Graphics/Graphics3d/Texture/ISwizzle.cs
deleted file mode 100644
index fae3eada..00000000
--- a/Ryujinx.Graphics/Graphics3d/Texture/ISwizzle.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Ryujinx.Graphics.Texture
-{
- interface ISwizzle
- {
- int GetSwizzleOffset(int x, int y, int z);
-
- void SetMipLevel(int level);
-
- int GetMipOffset(int level);
-
- int GetImageSize(int mipsCount);
- }
-} \ No newline at end of file
diff --git a/Ryujinx.Graphics/Graphics3d/Texture/ImageUtils.cs b/Ryujinx.Graphics/Graphics3d/Texture/ImageUtils.cs
deleted file mode 100644
index 10c36fe1..00000000
--- a/Ryujinx.Graphics/Graphics3d/Texture/ImageUtils.cs
+++ /dev/null
@@ -1,561 +0,0 @@
-using ARMeilleure.Memory;
-using OpenTK.Graphics.OpenGL;
-using Ryujinx.Graphics.Gal;
-using Ryujinx.Graphics.Memory;
-using System;
-using System.Collections.Generic;
-
-namespace Ryujinx.Graphics.Texture
-{
- public static class ImageUtils
- {
- [Flags]
- private enum TargetBuffer
- {
- Color = 1 << 0,
- Depth = 1 << 1,
- Stencil = 1 << 2,
-
- DepthStencil = Depth | Stencil
- }
-
- private struct ImageDescriptor
- {
- public int BytesPerPixel { get; private set; }
- public int BlockWidth { get; private set; }
- public int BlockHeight { get; private set; }
- public int BlockDepth { get; private set; }
-
- public TargetBuffer Target { get; private set; }
-
- public ImageDescriptor(int bytesPerPixel, int blockWidth, int blockHeight, int blockDepth, TargetBuffer target)
- {
- BytesPerPixel = bytesPerPixel;
- BlockWidth = blockWidth;
- BlockHeight = blockHeight;
- BlockDepth = blockDepth;
- Target = target;
- }
- }
-
- private const GalImageFormat Snorm = GalImageFormat.Snorm;
- private const GalImageFormat Unorm = GalImageFormat.Unorm;
- private const GalImageFormat Sint = GalImageFormat.Sint;
- private const GalImageFormat Uint = GalImageFormat.Uint;
- private const GalImageFormat Float = GalImageFormat.Float;
- private const GalImageFormat Srgb = GalImageFormat.Srgb;
-
- private static readonly Dictionary<GalTextureFormat, GalImageFormat> TextureTable =
- new Dictionary<GalTextureFormat, GalImageFormat>()
- {
- { GalTextureFormat.Rgba32, GalImageFormat.Rgba32 | Sint | Uint | Float },
- { GalTextureFormat.Rgba16, GalImageFormat.Rgba16 | Snorm | Unorm | Sint | Uint | Float },
- { GalTextureFormat.Rg32, GalImageFormat.Rg32 | Sint | Uint | Float },
- { GalTextureFormat.Rgba8, GalImageFormat.Rgba8 | Snorm | Unorm | Sint | Uint | Srgb },
- { GalTextureFormat.Rgb10A2, GalImageFormat.Rgb10A2 | Snorm | Unorm | Sint | Uint },
- { GalTextureFormat.Rg8, GalImageFormat.Rg8 | Snorm | Unorm | Sint | Uint },
- { GalTextureFormat.R16, GalImageFormat.R16 | Snorm | Unorm | Sint | Uint | Float },
- { GalTextureFormat.R8, GalImageFormat.R8 | Snorm | Unorm | Sint | Uint },
- { GalTextureFormat.Rg16, GalImageFormat.Rg16 | Snorm | Unorm | Sint | Float },
- { GalTextureFormat.R32, GalImageFormat.R32 | Sint | Uint | Float },
- { GalTextureFormat.Rgba4, GalImageFormat.Rgba4 | Unorm },
- { GalTextureFormat.Rgb5A1, GalImageFormat.Rgb5A1 | Unorm },
- { GalTextureFormat.Rgb565, GalImageFormat.Rgb565 | Unorm },
- { GalTextureFormat.R11G11B10F, GalImageFormat.R11G11B10 | Float },
- { GalTextureFormat.D24S8, GalImageFormat.D24S8 | Unorm | Uint },
- { GalTextureFormat.D32F, GalImageFormat.D32 | Float },
- { GalTextureFormat.D32Fx24S8, GalImageFormat.D32S8 | Float },
- { GalTextureFormat.D16, GalImageFormat.D16 | Unorm },
-
- // Compressed formats
- { GalTextureFormat.BptcSfloat, GalImageFormat.BptcSfloat | Float },
- { GalTextureFormat.BptcUfloat, GalImageFormat.BptcUfloat | Float },
- { GalTextureFormat.BptcUnorm, GalImageFormat.BptcUnorm | Unorm | Srgb },
- { GalTextureFormat.BC1, GalImageFormat.BC1 | Unorm | Srgb },
- { GalTextureFormat.BC2, GalImageFormat.BC2 | Unorm | Srgb },
- { GalTextureFormat.BC3, GalImageFormat.BC3 | Unorm | Srgb },
- { GalTextureFormat.BC4, GalImageFormat.BC4 | Unorm | Snorm },
- { GalTextureFormat.BC5, GalImageFormat.BC5 | Unorm | Snorm },
- { GalTextureFormat.Astc2D4x4, GalImageFormat.Astc2D4x4 | Unorm | Srgb },
- { GalTextureFormat.Astc2D5x5, GalImageFormat.Astc2D5x5 | Unorm | Srgb },
- { GalTextureFormat.Astc2D6x6, GalImageFormat.Astc2D6x6 | Unorm | Srgb },
- { GalTextureFormat.Astc2D8x8, GalImageFormat.Astc2D8x8 | Unorm | Srgb },
- { GalTextureFormat.Astc2D10x10, GalImageFormat.Astc2D10x10 | Unorm | Srgb },
- { GalTextureFormat.Astc2D12x12, GalImageFormat.Astc2D12x12 | Unorm | Srgb },
- { GalTextureFormat.Astc2D5x4, GalImageFormat.Astc2D5x4 | Unorm | Srgb },
- { GalTextureFormat.Astc2D6x5, GalImageFormat.Astc2D6x5 | Unorm | Srgb },
- { GalTextureFormat.Astc2D8x6, GalImageFormat.Astc2D8x6 | Unorm | Srgb },
- { GalTextureFormat.Astc2D10x8, GalImageFormat.Astc2D10x8 | Unorm | Srgb },
- { GalTextureFormat.Astc2D12x10, GalImageFormat.Astc2D12x10 | Unorm | Srgb },
- { GalTextureFormat.Astc2D8x5, GalImageFormat.Astc2D8x5 | Unorm | Srgb },
- { GalTextureFormat.Astc2D10x5, GalImageFormat.Astc2D10x5 | Unorm | Srgb },
- { GalTextureFormat.Astc2D10x6, GalImageFormat.Astc2D10x6 | Unorm | Srgb }
- };
-
- private static readonly Dictionary<GalImageFormat, ImageDescriptor> ImageTable =
- new Dictionary<GalImageFormat, ImageDescriptor>()
- {
- { GalImageFormat.Rgba32, new ImageDescriptor(16, 1, 1, 1, TargetBuffer.Color) },
- { GalImageFormat.Rgba16, new ImageDescriptor(8, 1, 1, 1, TargetBuffer.Color) },
- { GalImageFormat.Rg32, new ImageDescriptor(8, 1, 1, 1, TargetBuffer.Color) },
- { GalImageFormat.Rgbx8, new ImageDescriptor(4, 1, 1, 1, TargetBuffer.Color) },
- { GalImageFormat.Rgba8, new ImageDescriptor(4, 1, 1, 1, TargetBuffer.Color) },
- { GalImageFormat.Bgra8, new ImageDescriptor(4, 1, 1, 1, TargetBuffer.Color) },
- { GalImageFormat.Rgb10A2, new ImageDescriptor(4, 1, 1, 1, TargetBuffer.Color) },
- { GalImageFormat.R32, new ImageDescriptor(4, 1, 1, 1, TargetBuffer.Color) },
- { GalImageFormat.Rgba4, new ImageDescriptor(2, 1, 1, 1, TargetBuffer.Color) },
- { GalImageFormat.BptcSfloat, new ImageDescriptor(16, 4, 4, 1, TargetBuffer.Color) },
- { GalImageFormat.BptcUfloat, new ImageDescriptor(16, 4, 4, 1, TargetBuffer.Color) },
- { GalImageFormat.Bgr5A1, new ImageDescriptor(2, 1, 1, 1, TargetBuffer.Color) },
- { GalImageFormat.Rgb5A1, new ImageDescriptor(2, 1, 1, 1, TargetBuffer.Color) },
- { GalImageFormat.Rgb565, new ImageDescriptor(2, 1, 1, 1, TargetBuffer.Color) },
- { GalImageFormat.Bgr565, new ImageDescriptor(2, 1, 1, 1, TargetBuffer.Color) },
- { GalImageFormat.BptcUnorm, new ImageDescriptor(16, 4, 4, 1, TargetBuffer.Color) },
- { GalImageFormat.Rg16, new ImageDescriptor(4, 1, 1, 1, TargetBuffer.Color) },
- { GalImageFormat.Rg8, new ImageDescriptor(2, 1, 1, 1, TargetBuffer.Color) },
- { GalImageFormat.R16, new ImageDescriptor(2, 1, 1, 1, TargetBuffer.Color) },
- { GalImageFormat.R8, new ImageDescriptor(1, 1, 1, 1, TargetBuffer.Color) },
- { GalImageFormat.R11G11B10, new ImageDescriptor(4, 1, 1, 1, TargetBuffer.Color) },
- { GalImageFormat.BC1, new ImageDescriptor(8, 4, 4, 1, TargetBuffer.Color) },
- { GalImageFormat.BC2, new ImageDescriptor(16, 4, 4, 1, TargetBuffer.Color) },
- { GalImageFormat.BC3, new ImageDescriptor(16, 4, 4, 1, TargetBuffer.Color) },
- { GalImageFormat.BC4, new ImageDescriptor(8, 4, 4, 1, TargetBuffer.Color) },
- { GalImageFormat.BC5, new ImageDescriptor(16, 4, 4, 1, TargetBuffer.Color) },
- { GalImageFormat.Astc2D4x4, new ImageDescriptor(16, 4, 4, 1, TargetBuffer.Color) },
- { GalImageFormat.Astc2D5x5, new ImageDescriptor(16, 5, 5, 1, TargetBuffer.Color) },
- { GalImageFormat.Astc2D6x6, new ImageDescriptor(16, 6, 6, 1, TargetBuffer.Color) },
- { GalImageFormat.Astc2D8x8, new ImageDescriptor(16, 8, 8, 1, TargetBuffer.Color) },
- { GalImageFormat.Astc2D10x10, new ImageDescriptor(16, 10, 10, 1, TargetBuffer.Color) },
- { GalImageFormat.Astc2D12x12, new ImageDescriptor(16, 12, 12, 1, TargetBuffer.Color) },
- { GalImageFormat.Astc2D5x4, new ImageDescriptor(16, 5, 4, 1, TargetBuffer.Color) },
- { GalImageFormat.Astc2D6x5, new ImageDescriptor(16, 6, 5, 1, TargetBuffer.Color) },
- { GalImageFormat.Astc2D8x6, new ImageDescriptor(16, 8, 6, 1, TargetBuffer.Color) },
- { GalImageFormat.Astc2D10x8, new ImageDescriptor(16, 10, 8, 1, TargetBuffer.Color) },
- { GalImageFormat.Astc2D12x10, new ImageDescriptor(16, 12, 10, 1, TargetBuffer.Color) },
- { GalImageFormat.Astc2D8x5, new ImageDescriptor(16, 8, 5, 1, TargetBuffer.Color) },
- { GalImageFormat.Astc2D10x5, new ImageDescriptor(16, 10, 5, 1, TargetBuffer.Color) },
- { GalImageFormat.Astc2D10x6, new ImageDescriptor(16, 10, 6, 1, TargetBuffer.Color) },
-
- { GalImageFormat.D16, new ImageDescriptor(2, 1, 1, 1, TargetBuffer.Depth) },
- { GalImageFormat.D24, new ImageDescriptor(4, 1, 1, 1, TargetBuffer.Depth) },
- { GalImageFormat.D24S8, new ImageDescriptor(4, 1, 1, 1, TargetBuffer.DepthStencil) },
- { GalImageFormat.D32, new ImageDescriptor(4, 1, 1, 1, TargetBuffer.Depth) },
- { GalImageFormat.D32S8, new ImageDescriptor(8, 1, 1, 1, TargetBuffer.DepthStencil) }
- };
-
- public static GalImageFormat ConvertTexture(
- GalTextureFormat format,
- GalTextureType rType,
- GalTextureType gType,
- GalTextureType bType,
- GalTextureType aType,
- bool convSrgb)
- {
- if (!TextureTable.TryGetValue(format, out GalImageFormat imageFormat))
- {
- throw new NotImplementedException($"Format 0x{((int)format):x} not implemented!");
- }
-
- if (!HasDepth(imageFormat) && (rType != gType || rType != bType || rType != aType))
- {
- throw new NotImplementedException("Per component types are not implemented!");
- }
-
- GalImageFormat formatType = convSrgb ? Srgb : GetFormatType(rType);
-
- GalImageFormat combinedFormat = (imageFormat & GalImageFormat.FormatMask) | formatType;
-
- if (!imageFormat.HasFlag(formatType))
- {
- throw new NotImplementedException($"Format \"{combinedFormat}\" not implemented!");
- }
-
- return combinedFormat;
- }
-
- public static GalImageFormat ConvertSurface(GalSurfaceFormat format)
- {
- switch (format)
- {
- case GalSurfaceFormat.Rgba32Float: return GalImageFormat.Rgba32 | Float;
- case GalSurfaceFormat.Rgba32Uint: return GalImageFormat.Rgba32 | Uint;
- case GalSurfaceFormat.Rgba16Float: return GalImageFormat.Rgba16 | Float;
- case GalSurfaceFormat.Rgba16Uint: return GalImageFormat.Rgba16 | Uint;
- case GalSurfaceFormat.Rgba16Unorm: return GalImageFormat.Rgba16 | Unorm;
- case GalSurfaceFormat.Rg32Float: return GalImageFormat.Rg32 | Float;
- case GalSurfaceFormat.Rg32Sint: return GalImageFormat.Rg32 | Sint;
- case GalSurfaceFormat.Rg32Uint: return GalImageFormat.Rg32 | Uint;
- case GalSurfaceFormat.Bgra8Unorm: return GalImageFormat.Bgra8 | Unorm;
- case GalSurfaceFormat.Bgra8Srgb: return GalImageFormat.Bgra8 | Srgb;
- case GalSurfaceFormat.Rgb10A2Unorm: return GalImageFormat.Rgb10A2 | Unorm;
- case GalSurfaceFormat.Rgba8Unorm: return GalImageFormat.Rgba8 | Unorm;
- case GalSurfaceFormat.Rgba8Srgb: return GalImageFormat.Rgba8 | Srgb;
- case GalSurfaceFormat.Rgba8Snorm: return GalImageFormat.Rgba8 | Snorm;
- case GalSurfaceFormat.Rg16Snorm: return GalImageFormat.Rg16 | Snorm;
- case GalSurfaceFormat.Rg16Unorm: return GalImageFormat.Rg16 | Unorm;
- case GalSurfaceFormat.Rg16Sint: return GalImageFormat.Rg16 | Sint;
- case GalSurfaceFormat.Rg16Float: return GalImageFormat.Rg16 | Float;
- case GalSurfaceFormat.R11G11B10Float: return GalImageFormat.R11G11B10 | Float;
- case GalSurfaceFormat.R32Float: return GalImageFormat.R32 | Float;
- case GalSurfaceFormat.R32Uint: return GalImageFormat.R32 | Uint;
- case GalSurfaceFormat.Rg8Unorm: return GalImageFormat.Rg8 | Unorm;
- case GalSurfaceFormat.Rg8Snorm: return GalImageFormat.Rg8 | Snorm;
- case GalSurfaceFormat.R16Float: return GalImageFormat.R16 | Float;
- case GalSurfaceFormat.R16Unorm: return GalImageFormat.R16 | Unorm;
- case GalSurfaceFormat.R16Uint: return GalImageFormat.R16 | Uint;
- case GalSurfaceFormat.R8Unorm: return GalImageFormat.R8 | Unorm;
- case GalSurfaceFormat.R8Uint: return GalImageFormat.R8 | Uint;
- case GalSurfaceFormat.B5G6R5Unorm: return GalImageFormat.Rgb565 | Unorm;
- case GalSurfaceFormat.Bgr5A1Unorm: return GalImageFormat.Bgr5A1 | Unorm;
- case GalSurfaceFormat.Rgbx8Unorm: return GalImageFormat.Rgbx8 | Unorm;
- }
-
- throw new NotImplementedException(format.ToString());
- }
-
- public static GalImageFormat ConvertZeta(GalZetaFormat format)
- {
- switch (format)
- {
- case GalZetaFormat.D32Float: return GalImageFormat.D32 | Float;
- case GalZetaFormat.S8D24Unorm: return GalImageFormat.D24S8 | Unorm;
- case GalZetaFormat.D16Unorm: return GalImageFormat.D16 | Unorm;
- case GalZetaFormat.D24X8Unorm: return GalImageFormat.D24 | Unorm;
- case GalZetaFormat.D24S8Unorm: return GalImageFormat.D24S8 | Unorm;
- case GalZetaFormat.D32S8X24Float: return GalImageFormat.D32S8 | Float;
- }
-
- throw new NotImplementedException(format.ToString());
- }
-
- public static byte[] ReadTexture(IMemory memory, GalImage image, long position)
- {
- MemoryManager cpuMemory;
-
- if (memory is NvGpuVmm vmm)
- {
- cpuMemory = vmm.Memory;
- }
- else
- {
- cpuMemory = (MemoryManager)memory;
- }
-
- ISwizzle swizzle = TextureHelper.GetSwizzle(image);
-
- ImageDescriptor desc = GetImageDescriptor(image.Format);
-
- (int width, int height, int depth) = GetImageSizeInBlocks(image);
-
- int bytesPerPixel = desc.BytesPerPixel;
-
- // Note: Each row of the texture needs to be aligned to 4 bytes.
- int pitch = (width * bytesPerPixel + 3) & ~3;
-
- int dataLayerSize = height * pitch * depth;
- byte[] data = new byte[dataLayerSize * image.LayerCount];
-
- int targetMipLevel = image.MaxMipmapLevel <= 1 ? 1 : image.MaxMipmapLevel - 1;
- int layerOffset = GetLayerOffset(image, targetMipLevel);
-
- for (int layer = 0; layer < image.LayerCount; layer++)
- {
- for (int z = 0; z < depth; z++)
- {
- for (int y = 0; y < height; y++)
- {
- int outOffs = (dataLayerSize * layer) + y * pitch + (z * width * height * bytesPerPixel);
-
- for (int x = 0; x < width; x++)
- {
- long offset = (uint)swizzle.GetSwizzleOffset(x, y, z);
-
- cpuMemory.ReadBytes(position + (layerOffset * layer) + offset, data, outOffs, bytesPerPixel);
-
- outOffs += bytesPerPixel;
- }
- }
- }
- }
-
- return data;
- }
-
- public static void WriteTexture(NvGpuVmm vmm, GalImage image, long position, byte[] data)
- {
- ISwizzle swizzle = TextureHelper.GetSwizzle(image);
-
- ImageDescriptor desc = GetImageDescriptor(image.Format);
-
- (int width, int height, int depth) = GetImageSizeInBlocks(image);
-
- int bytesPerPixel = desc.BytesPerPixel;
-
- int inOffs = 0;
-
- for (int z = 0; z < depth; z++)
- for (int y = 0; y < height; y++)
- for (int x = 0; x < width; x++)
- {
- long offset = (uint)swizzle.GetSwizzleOffset(x, y, z);
-
- vmm.Memory.WriteBytes(position + offset, data, inOffs, bytesPerPixel);
-
- inOffs += bytesPerPixel;
- }
- }
-
- // TODO: Support non 2D
- public static bool CopyTexture(
- NvGpuVmm vmm,
- GalImage srcImage,
- GalImage dstImage,
- long srcAddress,
- long dstAddress,
- int srcX,
- int srcY,
- int dstX,
- int dstY,
- int width,
- int height)
- {
- ISwizzle srcSwizzle = TextureHelper.GetSwizzle(srcImage);
- ISwizzle dstSwizzle = TextureHelper.GetSwizzle(dstImage);
-
- ImageDescriptor desc = GetImageDescriptor(srcImage.Format);
-
- if (GetImageDescriptor(dstImage.Format).BytesPerPixel != desc.BytesPerPixel)
- {
- return false;
- }
-
- int bytesPerPixel = desc.BytesPerPixel;
-
- for (int y = 0; y < height; y++)
- for (int x = 0; x < width; x++)
- {
- long srcOffset = (uint)srcSwizzle.GetSwizzleOffset(srcX + x, srcY + y, 0);
- long dstOffset = (uint)dstSwizzle.GetSwizzleOffset(dstX + x, dstY + y, 0);
-
- byte[] texel = vmm.ReadBytes(srcAddress + srcOffset, bytesPerPixel);
-
- vmm.WriteBytes(dstAddress + dstOffset, texel);
- }
-
- return true;
- }
-
- public static int GetSize(GalImage image)
- {
- ImageDescriptor desc = GetImageDescriptor(image.Format);
-
- int componentCount = GetCoordsCountTextureTarget(image.TextureTarget);
-
- if (IsArray(image.TextureTarget))
- componentCount--;
-
- int width = DivRoundUp(image.Width, desc.BlockWidth);
- int height = DivRoundUp(image.Height, desc.BlockHeight);
- int depth = DivRoundUp(image.Depth, desc.BlockDepth);
-
- switch (componentCount)
- {
- case 1:
- return desc.BytesPerPixel * width * image.LayerCount;
- case 2:
- return desc.BytesPerPixel * width * height * image.LayerCount;
- case 3:
- return desc.BytesPerPixel * width * height * depth * image.LayerCount;
- default:
- throw new InvalidOperationException($"Invalid component count: {componentCount}");
- }
- }
-
- public static int GetGpuSize(GalImage image, bool forcePitch = false)
- {
- return TextureHelper.GetSwizzle(image).GetImageSize(image.MaxMipmapLevel) * image.LayerCount;
- }
-
- public static int GetLayerOffset(GalImage image, int mipLevel)
- {
- if (mipLevel <= 0)
- {
- mipLevel = 1;
- }
-
- return TextureHelper.GetSwizzle(image).GetMipOffset(mipLevel);
- }
-
- public static int GetPitch(GalImageFormat format, int width)
- {
- ImageDescriptor desc = GetImageDescriptor(format);
-
- int pitch = desc.BytesPerPixel * DivRoundUp(width, desc.BlockWidth);
-
- pitch = (pitch + 0x1f) & ~0x1f;
-
- return pitch;
- }
-
- public static int GetBlockWidth(GalImageFormat format)
- {
- return GetImageDescriptor(format).BlockWidth;
- }
-
- public static int GetBlockHeight(GalImageFormat format)
- {
- return GetImageDescriptor(format).BlockHeight;
- }
-
- public static int GetBlockDepth(GalImageFormat format)
- {
- return GetImageDescriptor(format).BlockDepth;
- }
-
- public static int GetAlignedWidth(GalImage image)
- {
- ImageDescriptor desc = GetImageDescriptor(image.Format);
-
- int alignMask;
-
- if (image.Layout == GalMemoryLayout.BlockLinear)
- {
- alignMask = image.TileWidth * (64 / desc.BytesPerPixel) - 1;
- }
- else
- {
- alignMask = (32 / desc.BytesPerPixel) - 1;
- }
-
- return (image.Width + alignMask) & ~alignMask;
- }
-
- public static (int Width, int Height, int Depth) GetImageSizeInBlocks(GalImage image)
- {
- ImageDescriptor desc = GetImageDescriptor(image.Format);
-
- return (DivRoundUp(image.Width, desc.BlockWidth),
- DivRoundUp(image.Height, desc.BlockHeight),
- DivRoundUp(image.Depth, desc.BlockDepth));
- }
-
- public static int GetBytesPerPixel(GalImageFormat format)
- {
- return GetImageDescriptor(format).BytesPerPixel;
- }
-
- private static int DivRoundUp(int lhs, int rhs)
- {
- return (lhs + (rhs - 1)) / rhs;
- }
-
- public static bool HasColor(GalImageFormat format)
- {
- return (GetImageDescriptor(format).Target & TargetBuffer.Color) != 0;
- }
-
- public static bool HasDepth(GalImageFormat format)
- {
- return (GetImageDescriptor(format).Target & TargetBuffer.Depth) != 0;
- }
-
- public static bool HasStencil(GalImageFormat format)
- {
- return (GetImageDescriptor(format).Target & TargetBuffer.Stencil) != 0;
- }
-
- public static bool IsCompressed(GalImageFormat format)
- {
- ImageDescriptor desc = GetImageDescriptor(format);
-
- return (desc.BlockWidth | desc.BlockHeight) != 1;
- }
-
- private static ImageDescriptor GetImageDescriptor(GalImageFormat format)
- {
- GalImageFormat pixelFormat = format & GalImageFormat.FormatMask;
-
- if (ImageTable.TryGetValue(pixelFormat, out ImageDescriptor descriptor))
- {
- return descriptor;
- }
-
- throw new NotImplementedException($"Format \"{pixelFormat}\" not implemented!");
- }
-
- private static GalImageFormat GetFormatType(GalTextureType type)
- {
- switch (type)
- {
- case GalTextureType.Snorm: return Snorm;
- case GalTextureType.Unorm: return Unorm;
- case GalTextureType.Sint: return Sint;
- case GalTextureType.Uint: return Uint;
- case GalTextureType.Float: return Float;
-
- default: throw new NotImplementedException(((int)type).ToString());
- }
- }
-
- public static TextureTarget GetTextureTarget(GalTextureTarget galTextureTarget)
- {
- switch (galTextureTarget)
- {
- case GalTextureTarget.OneD:
- return TextureTarget.Texture1D;
- case GalTextureTarget.TwoD:
- case GalTextureTarget.TwoDNoMipMap:
- return TextureTarget.Texture2D;
- case GalTextureTarget.ThreeD:
- return TextureTarget.Texture3D;
- case GalTextureTarget.OneDArray:
- return TextureTarget.Texture1DArray;
- case GalTextureTarget.OneDBuffer:
- return TextureTarget.TextureBuffer;
- case GalTextureTarget.TwoDArray:
- return TextureTarget.Texture2DArray;
- case GalTextureTarget.CubeMap:
- return TextureTarget.TextureCubeMap;
- case GalTextureTarget.CubeArray:
- return TextureTarget.TextureCubeMapArray;
- default:
- throw new NotSupportedException($"Texture target {galTextureTarget} currently not supported!");
- }
- }
-
- public static bool IsArray(GalTextureTarget textureTarget)
- {
- switch (textureTarget)
- {
- case GalTextureTarget.OneDArray:
- case GalTextureTarget.TwoDArray:
- case GalTextureTarget.CubeArray:
- return true;
- default:
- return false;
- }
- }
-
- public static int GetCoordsCountTextureTarget(GalTextureTarget textureTarget)
- {
- switch (textureTarget)
- {
- case GalTextureTarget.OneD:
- return 1;
- case GalTextureTarget.OneDArray:
- case GalTextureTarget.OneDBuffer:
- case GalTextureTarget.TwoD:
- case GalTextureTarget.TwoDNoMipMap:
- return 2;
- case GalTextureTarget.ThreeD:
- case GalTextureTarget.TwoDArray:
- case GalTextureTarget.CubeMap:
- return 3;
- case GalTextureTarget.CubeArray:
- return 4;
- default:
- throw new NotImplementedException($"TextureTarget.{textureTarget} not implemented yet.");
- }
- }
- }
-}
diff --git a/Ryujinx.Graphics/Graphics3d/Texture/IntegerEncoded.cs b/Ryujinx.Graphics/Graphics3d/Texture/IntegerEncoded.cs
deleted file mode 100644
index e6d67058..00000000
--- a/Ryujinx.Graphics/Graphics3d/Texture/IntegerEncoded.cs
+++ /dev/null
@@ -1,269 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-
-namespace Ryujinx.Graphics.Texture
-{
- public struct IntegerEncoded
- {
- public enum EIntegerEncoding
- {
- JustBits,
- Quint,
- Trit
- }
-
- EIntegerEncoding _encoding;
- public int NumberBits { get; private set; }
- public int BitValue { get; private set; }
- public int TritValue { get; private set; }
- public int QuintValue { get; private set; }
-
- public IntegerEncoded(EIntegerEncoding encoding, int numBits)
- {
- _encoding = encoding;
- NumberBits = numBits;
- BitValue = 0;
- TritValue = 0;
- QuintValue = 0;
- }
-
- public bool MatchesEncoding(IntegerEncoded other)
- {
- return _encoding == other._encoding && NumberBits == other.NumberBits;
- }
-
- public EIntegerEncoding GetEncoding()
- {
- return _encoding;
- }
-
- public int GetBitLength(int numberVals)
- {
- int totalBits = NumberBits * numberVals;
- if (_encoding == EIntegerEncoding.Trit)
- {
- totalBits += (numberVals * 8 + 4) / 5;
- }
- else if (_encoding == EIntegerEncoding.Quint)
- {
- totalBits += (numberVals * 7 + 2) / 3;
- }
- return totalBits;
- }
-
- public static IntegerEncoded CreateEncoding(int maxVal)
- {
- while (maxVal > 0)
- {
- int check = maxVal + 1;
-
- // Is maxVal a power of two?
- if ((check & (check - 1)) == 0)
- {
- return new IntegerEncoded(EIntegerEncoding.JustBits, BitArrayStream.PopCnt(maxVal));
- }
-
- // Is maxVal of the type 3*2^n - 1?
- if ((check % 3 == 0) && ((check / 3) & ((check / 3) - 1)) == 0)
- {
- return new IntegerEncoded(EIntegerEncoding.Trit, BitArrayStream.PopCnt(check / 3 - 1));
- }
-
- // Is maxVal of the type 5*2^n - 1?
- if ((check % 5 == 0) && ((check / 5) & ((check / 5) - 1)) == 0)
- {
- return new IntegerEncoded(EIntegerEncoding.Quint, BitArrayStream.PopCnt(check / 5 - 1));
- }
-
- // Apparently it can't be represented with a bounded integer sequence...
- // just iterate.
- maxVal--;
- }
-
- return new IntegerEncoded(EIntegerEncoding.JustBits, 0);
- }
-
- public static void DecodeTritBlock(
- BitArrayStream bitStream,
- List<IntegerEncoded> listIntegerEncoded,
- int numberBitsPerValue)
- {
- // Implement the algorithm in section C.2.12
- int[] m = new int[5];
- int[] t = new int[5];
- int T;
-
- // Read the trit encoded block according to
- // table C.2.14
- m[0] = bitStream.ReadBits(numberBitsPerValue);
- T = bitStream.ReadBits(2);
- m[1] = bitStream.ReadBits(numberBitsPerValue);
- T |= bitStream.ReadBits(2) << 2;
- m[2] = bitStream.ReadBits(numberBitsPerValue);
- T |= bitStream.ReadBits(1) << 4;
- m[3] = bitStream.ReadBits(numberBitsPerValue);
- T |= bitStream.ReadBits(2) << 5;
- m[4] = bitStream.ReadBits(numberBitsPerValue);
- T |= bitStream.ReadBits(1) << 7;
-
- int c = 0;
-
- BitArrayStream tb = new BitArrayStream(new BitArray(new int[] { T }));
- if (tb.ReadBits(2, 4) == 7)
- {
- c = (tb.ReadBits(5, 7) << 2) | tb.ReadBits(0, 1);
- t[4] = t[3] = 2;
- }
- else
- {
- c = tb.ReadBits(0, 4);
- if (tb.ReadBits(5, 6) == 3)
- {
- t[4] = 2;
- t[3] = tb.ReadBit(7);
- }
- else
- {
- t[4] = tb.ReadBit(7);
- t[3] = tb.ReadBits(5, 6);
- }
- }
-
- BitArrayStream cb = new BitArrayStream(new BitArray(new int[] { c }));
- if (cb.ReadBits(0, 1) == 3)
- {
- t[2] = 2;
- t[1] = cb.ReadBit(4);
- t[0] = (cb.ReadBit(3) << 1) | (cb.ReadBit(2) & ~cb.ReadBit(3));
- }
- else if (cb.ReadBits(2, 3) == 3)
- {
- t[2] = 2;
- t[1] = 2;
- t[0] = cb.ReadBits(0, 1);
- }
- else
- {
- t[2] = cb.ReadBit(4);
- t[1] = cb.ReadBits(2, 3);
- t[0] = (cb.ReadBit(1) << 1) | (cb.ReadBit(0) & ~cb.ReadBit(1));
- }
-
- for (int i = 0; i < 5; i++)
- {
- IntegerEncoded intEncoded = new IntegerEncoded(EIntegerEncoding.Trit, numberBitsPerValue)
- {
- BitValue = m[i],
- TritValue = t[i]
- };
- listIntegerEncoded.Add(intEncoded);
- }
- }
-
- public static void DecodeQuintBlock(
- BitArrayStream bitStream,
- List<IntegerEncoded> listIntegerEncoded,
- int numberBitsPerValue)
- {
- // Implement the algorithm in section C.2.12
- int[] m = new int[3];
- int[] qa = new int[3];
- int q;
-
- // Read the trit encoded block according to
- // table C.2.15
- m[0] = bitStream.ReadBits(numberBitsPerValue);
- q = bitStream.ReadBits(3);
- m[1] = bitStream.ReadBits(numberBitsPerValue);
- q |= bitStream.ReadBits(2) << 3;
- m[2] = bitStream.ReadBits(numberBitsPerValue);
- q |= bitStream.ReadBits(2) << 5;
-
- BitArrayStream qb = new BitArrayStream(new BitArray(new int[] { q }));
- if (qb.ReadBits(1, 2) == 3 && qb.ReadBits(5, 6) == 0)
- {
- qa[0] = qa[1] = 4;
- qa[2] = (qb.ReadBit(0) << 2) | ((qb.ReadBit(4) & ~qb.ReadBit(0)) << 1) | (qb.ReadBit(3) & ~qb.ReadBit(0));
- }
- else
- {
- int c = 0;
- if (qb.ReadBits(1, 2) == 3)
- {
- qa[2] = 4;
- c = (qb.ReadBits(3, 4) << 3) | ((~qb.ReadBits(5, 6) & 3) << 1) | qb.ReadBit(0);
- }
- else
- {
- qa[2] = qb.ReadBits(5, 6);
- c = qb.ReadBits(0, 4);
- }
-
- BitArrayStream cb = new BitArrayStream(new BitArray(new int[] { c }));
- if (cb.ReadBits(0, 2) == 5)
- {
- qa[1] = 4;
- qa[0] = cb.ReadBits(3, 4);
- }
- else
- {
- qa[1] = cb.ReadBits(3, 4);
- qa[0] = cb.ReadBits(0, 2);
- }
- }
-
- for (int i = 0; i < 3; i++)
- {
- IntegerEncoded intEncoded = new IntegerEncoded(EIntegerEncoding.Quint, numberBitsPerValue)
- {
- BitValue = m[i],
- QuintValue = qa[i]
- };
- listIntegerEncoded.Add(intEncoded);
- }
- }
-
- public static void DecodeIntegerSequence(
- List<IntegerEncoded> decodeIntegerSequence,
- BitArrayStream bitStream,
- int maxRange,
- int numberValues)
- {
- // Determine encoding parameters
- IntegerEncoded intEncoded = CreateEncoding(maxRange);
-
- // Start decoding
- int numberValuesDecoded = 0;
- while (numberValuesDecoded < numberValues)
- {
- switch (intEncoded.GetEncoding())
- {
- case EIntegerEncoding.Quint:
- {
- DecodeQuintBlock(bitStream, decodeIntegerSequence, intEncoded.NumberBits);
- numberValuesDecoded += 3;
-
- break;
- }
-
- case EIntegerEncoding.Trit:
- {
- DecodeTritBlock(bitStream, decodeIntegerSequence, intEncoded.NumberBits);
- numberValuesDecoded += 5;
-
- break;
- }
-
- case EIntegerEncoding.JustBits:
- {
- intEncoded.BitValue = bitStream.ReadBits(intEncoded.NumberBits);
- decodeIntegerSequence.Add(intEncoded);
- numberValuesDecoded++;
-
- break;
- }
- }
- }
- }
- }
-}
diff --git a/Ryujinx.Graphics/Graphics3d/Texture/LinearSwizzle.cs b/Ryujinx.Graphics/Graphics3d/Texture/LinearSwizzle.cs
deleted file mode 100644
index fb1bd098..00000000
--- a/Ryujinx.Graphics/Graphics3d/Texture/LinearSwizzle.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-
-namespace Ryujinx.Graphics.Texture
-{
- class LinearSwizzle : ISwizzle
- {
- private int _pitch;
- private int _bpp;
-
- private int _sliceSize;
-
- public LinearSwizzle(int pitch, int bpp, int width, int height)
- {
- _pitch = pitch;
- _bpp = bpp;
- _sliceSize = width * height * bpp;
- }
-
- public void SetMipLevel(int level)
- {
- throw new NotImplementedException();
- }
-
- public int GetMipOffset(int level)
- {
- if (level == 1)
- return _sliceSize;
- throw new NotImplementedException();
- }
-
- public int GetImageSize(int mipsCount)
- {
- int size = GetMipOffset(mipsCount);
-
- size = (size + 0x1fff) & ~0x1fff;
-
- return size;
- }
-
- public int GetSwizzleOffset(int x, int y, int z)
- {
- return z * _sliceSize + x * _bpp + y * _pitch;
- }
- }
-} \ No newline at end of file
diff --git a/Ryujinx.Graphics/Graphics3d/Texture/TextureFactory.cs b/Ryujinx.Graphics/Graphics3d/Texture/TextureFactory.cs
deleted file mode 100644
index 28c90502..00000000
--- a/Ryujinx.Graphics/Graphics3d/Texture/TextureFactory.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-using Ryujinx.Graphics.Gal;
-using Ryujinx.Graphics.Memory;
-using System;
-
-namespace Ryujinx.Graphics.Texture
-{
- static class TextureFactory
- {
- public static GalImage MakeTexture(NvGpuVmm vmm, long ticPosition)
- {
- int[] tic = ReadWords(vmm, ticPosition, 8);
-
- GalImageFormat format = GetImageFormat(tic);
-
- GalTextureTarget textureTarget = (GalTextureTarget)((tic[4] >> 23) & 0xF);
-
- GalTextureSource xSource = (GalTextureSource)((tic[0] >> 19) & 7);
- GalTextureSource ySource = (GalTextureSource)((tic[0] >> 22) & 7);
- GalTextureSource zSource = (GalTextureSource)((tic[0] >> 25) & 7);
- GalTextureSource wSource = (GalTextureSource)((tic[0] >> 28) & 7);
-
- TextureSwizzle swizzle = (TextureSwizzle)((tic[2] >> 21) & 7);
-
- int maxMipmapLevel = (tic[3] >> 28) & 0xF + 1;
-
- GalMemoryLayout layout;
-
- if (swizzle == TextureSwizzle.BlockLinear ||
- swizzle == TextureSwizzle.BlockLinearColorKey)
- {
- layout = GalMemoryLayout.BlockLinear;
- }
- else
- {
- layout = GalMemoryLayout.Pitch;
- }
-
- int gobBlockHeightLog2 = (tic[3] >> 3) & 7;
- int gobBlockDepthLog2 = (tic[3] >> 6) & 7;
- int tileWidthLog2 = (tic[3] >> 10) & 7;
-
- int gobBlockHeight = 1 << gobBlockHeightLog2;
- int gobBlockDepth = 1 << gobBlockDepthLog2;
- int tileWidth = 1 << tileWidthLog2;
-
- int width = ((tic[4] >> 0) & 0xffff) + 1;
- int height = ((tic[5] >> 0) & 0xffff) + 1;
- int depth = ((tic[5] >> 16) & 0x3fff) + 1;
-
- int layoutCount = 1;
-
- // TODO: check this
- if (ImageUtils.IsArray(textureTarget))
- {
- layoutCount = depth;
- depth = 1;
- }
-
- if (textureTarget == GalTextureTarget.OneD)
- {
- height = 1;
- }
-
- if (textureTarget == GalTextureTarget.TwoD || textureTarget == GalTextureTarget.OneD)
- {
- depth = 1;
- }
- else if (textureTarget == GalTextureTarget.CubeMap)
- {
- // FIXME: This is a bit hacky but I guess it's fine for now
- layoutCount = 6;
- depth = 1;
- }
- else if (textureTarget == GalTextureTarget.CubeArray)
- {
- // FIXME: This is a really really hacky but I guess it's fine for now
- layoutCount *= 6;
- depth = 1;
- }
-
- GalImage image = new GalImage(
- width,
- height,
- depth,
- layoutCount,
- tileWidth,
- gobBlockHeight,
- gobBlockDepth,
- layout,
- format,
- textureTarget,
- maxMipmapLevel,
- xSource,
- ySource,
- zSource,
- wSource);
-
- if (layout == GalMemoryLayout.Pitch)
- {
- image.Pitch = (tic[3] & 0xffff) << 5;
- }
-
- return image;
- }
-
- public static GalTextureSampler MakeSampler(NvGpu gpu, NvGpuVmm vmm, long tscPosition)
- {
- int[] tsc = ReadWords(vmm, tscPosition, 8);
-
- GalTextureWrap addressU = (GalTextureWrap)((tsc[0] >> 0) & 7);
- GalTextureWrap addressV = (GalTextureWrap)((tsc[0] >> 3) & 7);
- GalTextureWrap addressP = (GalTextureWrap)((tsc[0] >> 6) & 7);
-
- bool depthCompare = ((tsc[0] >> 9) & 1) == 1;
-
- DepthCompareFunc depthCompareFunc = (DepthCompareFunc)((tsc[0] >> 10) & 7);
-
- GalTextureFilter magFilter = (GalTextureFilter) ((tsc[1] >> 0) & 3);
- GalTextureFilter minFilter = (GalTextureFilter) ((tsc[1] >> 4) & 3);
- GalTextureMipFilter mipFilter = (GalTextureMipFilter)((tsc[1] >> 6) & 3);
-
- GalColorF borderColor = new GalColorF(
- BitConverter.Int32BitsToSingle(tsc[4]),
- BitConverter.Int32BitsToSingle(tsc[5]),
- BitConverter.Int32BitsToSingle(tsc[6]),
- BitConverter.Int32BitsToSingle(tsc[7]));
-
- return new GalTextureSampler(
- addressU,
- addressV,
- addressP,
- minFilter,
- magFilter,
- mipFilter,
- borderColor,
- depthCompare,
- depthCompareFunc);
- }
-
- private static GalImageFormat GetImageFormat(int[] tic)
- {
- GalTextureType rType = (GalTextureType)((tic[0] >> 7) & 7);
- GalTextureType gType = (GalTextureType)((tic[0] >> 10) & 7);
- GalTextureType bType = (GalTextureType)((tic[0] >> 13) & 7);
- GalTextureType aType = (GalTextureType)((tic[0] >> 16) & 7);
-
- GalTextureFormat format = (GalTextureFormat)(tic[0] & 0x7f);
-
- bool convSrgb = ((tic[4] >> 22) & 1) != 0;
-
- return ImageUtils.ConvertTexture(format, rType, gType, bType, aType, convSrgb);
- }
-
- private static int[] ReadWords(NvGpuVmm vmm, long position, int count)
- {
- int[] words = new int[count];
-
- for (int index = 0; index < count; index++, position += 4)
- {
- words[index] = vmm.ReadInt32(position);
- }
-
- return words;
- }
- }
-} \ No newline at end of file
diff --git a/Ryujinx.Graphics/Graphics3d/Texture/TextureHelper.cs b/Ryujinx.Graphics/Graphics3d/Texture/TextureHelper.cs
deleted file mode 100644
index e07eb037..00000000
--- a/Ryujinx.Graphics/Graphics3d/Texture/TextureHelper.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using ARMeilleure.Memory;
-using Ryujinx.Common;
-using Ryujinx.Graphics.Gal;
-using Ryujinx.Graphics.Memory;
-
-namespace Ryujinx.Graphics.Texture
-{
- static class TextureHelper
- {
- public static ISwizzle GetSwizzle(GalImage image)
- {
- int blockWidth = ImageUtils.GetBlockWidth (image.Format);
- int blockHeight = ImageUtils.GetBlockHeight (image.Format);
- int blockDepth = ImageUtils.GetBlockDepth (image.Format);
- int bytesPerPixel = ImageUtils.GetBytesPerPixel(image.Format);
-
- int width = BitUtils.DivRoundUp(image.Width, blockWidth);
- int height = BitUtils.DivRoundUp(image.Height, blockHeight);
- int depth = BitUtils.DivRoundUp(image.Depth, blockDepth);
-
- if (image.Layout == GalMemoryLayout.BlockLinear)
- {
- int alignMask = image.TileWidth * (64 / bytesPerPixel) - 1;
-
- width = (width + alignMask) & ~alignMask;
-
- return new BlockLinearSwizzle(
- width,
- height,
- depth,
- image.GobBlockHeight,
- image.GobBlockDepth,
- bytesPerPixel);
- }
- else
- {
- return new LinearSwizzle(image.Pitch, bytesPerPixel, width, height);
- }
- }
-
- public static (MemoryManager Memory, long Position) GetMemoryAndPosition(
- IMemory memory,
- long position)
- {
- if (memory is NvGpuVmm vmm)
- {
- return (vmm.Memory, vmm.GetPhysicalAddress(position));
- }
-
- return ((MemoryManager)memory, position);
- }
- }
-}
diff --git a/Ryujinx.Graphics/Graphics3d/Texture/TextureSwizzle.cs b/Ryujinx.Graphics/Graphics3d/Texture/TextureSwizzle.cs
deleted file mode 100644
index 2cc426ab..00000000
--- a/Ryujinx.Graphics/Graphics3d/Texture/TextureSwizzle.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Ryujinx.Graphics.Texture
-{
- public enum TextureSwizzle
- {
- _1DBuffer = 0,
- PitchColorKey = 1,
- Pitch = 2,
- BlockLinear = 3,
- BlockLinearColorKey = 4
- }
-} \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-08 12:03:54 +0000