aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Graphics.Shader/Translation
diff options
context:
space:
mode:
Diffstat (limited to 'Ryujinx.Graphics.Shader/Translation')
-rw-r--r--Ryujinx.Graphics.Shader/Translation/ShaderConfig.cs2
-rw-r--r--Ryujinx.Graphics.Shader/Translation/Translator.cs4
-rw-r--r--Ryujinx.Graphics.Shader/Translation/UInt128.cs112
3 files changed, 3 insertions, 115 deletions
diff --git a/Ryujinx.Graphics.Shader/Translation/ShaderConfig.cs b/Ryujinx.Graphics.Shader/Translation/ShaderConfig.cs
index 22747160..c70ec16c 100644
--- a/Ryujinx.Graphics.Shader/Translation/ShaderConfig.cs
+++ b/Ryujinx.Graphics.Shader/Translation/ShaderConfig.cs
@@ -254,7 +254,7 @@ namespace Ryujinx.Graphics.Shader.Translation
UsedInputAttributes |= mask;
_thisUsedInputAttributes |= mask;
- ThisInputAttributesComponents |= UInt128.Pow2(index * 4 + component);
+ ThisInputAttributesComponents |= UInt128.One << (index * 4 + component);
}
public void SetInputUserAttributePerPatch(int index)
diff --git a/Ryujinx.Graphics.Shader/Translation/Translator.cs b/Ryujinx.Graphics.Shader/Translation/Translator.cs
index ff0de1bd..8741f848 100644
--- a/Ryujinx.Graphics.Shader/Translation/Translator.cs
+++ b/Ryujinx.Graphics.Shader/Translation/Translator.cs
@@ -190,10 +190,10 @@ namespace Ryujinx.Graphics.Shader.Translation
UInt128 usedAttributes = context.Config.NextInputAttributesComponents;
while (usedAttributes != UInt128.Zero)
{
- int index = usedAttributes.TrailingZeroCount();
+ int index = (int)UInt128.TrailingZeroCount(usedAttributes);
int vecIndex = index / 4;
- usedAttributes &= ~UInt128.Pow2(index);
+ usedAttributes &= ~(UInt128.One << index);
// We don't need to initialize passthrough attributes.
if ((context.Config.PassthroughAttributes & (1 << vecIndex)) != 0)
diff --git a/Ryujinx.Graphics.Shader/Translation/UInt128.cs b/Ryujinx.Graphics.Shader/Translation/UInt128.cs
deleted file mode 100644
index ffbce77a..00000000
--- a/Ryujinx.Graphics.Shader/Translation/UInt128.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-using System;
-using System.Numerics;
-
-namespace Ryujinx.Graphics.Shader.Translation
-{
- struct UInt128 : IEquatable<UInt128>
- {
- public static UInt128 Zero => new UInt128() { _v0 = 0, _v1 = 0 };
-
- private ulong _v0;
- private ulong _v1;
-
- public UInt128(ulong low, ulong high)
- {
- _v0 = low;
- _v1 = high;
- }
-
- public int TrailingZeroCount()
- {
- int count = BitOperations.TrailingZeroCount(_v0);
- if (count == 64)
- {
- count += BitOperations.TrailingZeroCount(_v1);
- }
-
- return count;
- }
-
- public static UInt128 Pow2(int x)
- {
- if (x >= 64)
- {
- return new UInt128(0, 1UL << (x - 64));
- }
-
- return new UInt128(1UL << x, 0);
- }
-
- public static UInt128 operator ~(UInt128 x)
- {
- return new UInt128(~x._v0, ~x._v1);
- }
-
- public static UInt128 operator &(UInt128 x, UInt128 y)
- {
- return new UInt128(x._v0 & y._v0, x._v1 & y._v1);
- }
-
- public static UInt128 operator |(UInt128 x, UInt128 y)
- {
- return new UInt128(x._v0 | y._v0, x._v1 | y._v1);
- }
-
- public static UInt128 operator <<(UInt128 x, int shift)
- {
- if (shift == 0)
- {
- return new UInt128(x._v0, x._v1);
- }
- else if (shift >= 64)
- {
- return new UInt128(0, x._v0 << (shift - 64));
- }
-
- ulong shiftOut = x._v0 >> (64 - shift);
-
- return new UInt128(x._v0 << shift, (x._v1 << shift) | shiftOut);
- }
-
- public static UInt128 operator >>(UInt128 x, int shift)
- {
- if (shift == 0)
- {
- return new UInt128(x._v0, x._v1);
- }
- else if (shift >= 64)
- {
- return new UInt128(x._v1 >> (shift - 64), 0);
- }
-
- ulong shiftOut = x._v1 & ((1UL << shift) - 1);
-
- return new UInt128((x._v0 >> shift) | (shiftOut << (64 - shift)), x._v1 >> shift);
- }
-
- public static bool operator ==(UInt128 x, UInt128 y)
- {
- return x.Equals(y);
- }
-
- public static bool operator !=(UInt128 x, UInt128 y)
- {
- return !x.Equals(y);
- }
-
- public override bool Equals(object obj)
- {
- return obj is UInt128 other && Equals(other);
- }
-
- public bool Equals(UInt128 other)
- {
- return _v0 == other._v0 && _v1 == other._v1;
- }
-
- public override int GetHashCode()
- {
- return HashCode.Combine(_v0, _v1);
- }
- }
-} \ No newline at end of file