diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2024-09-01 17:58:01 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-01 17:58:01 -0300 |
| commit | fdd7ee791cd37546390856f38eab16ea78451742 (patch) | |
| tree | e4da2a50459f8d11c958207f0e4684a19d3e48fa /src | |
| parent | 398fa1c238df75ee93f7106a578569f87cae8c0b (diff) | |
Fix incorrect depth texture 3D flag (#7262)1.1.1384
Diffstat (limited to 'src')
| -rw-r--r-- | src/Ryujinx.Graphics.Gpu/Engine/Threed/ThreedClassState.cs | 8 | ||||
| -rw-r--r-- | src/Ryujinx.Graphics.Gpu/Image/TextureCache.cs | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/Ryujinx.Graphics.Gpu/Engine/Threed/ThreedClassState.cs b/src/Ryujinx.Graphics.Gpu/Engine/Threed/ThreedClassState.cs index dd55e7d1..35051c6e 100644 --- a/src/Ryujinx.Graphics.Gpu/Engine/Threed/ThreedClassState.cs +++ b/src/Ryujinx.Graphics.Gpu/Engine/Threed/ThreedClassState.cs @@ -415,7 +415,13 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed #pragma warning disable CS0649 // Field is never assigned to public int Width; public int Height; - public int Depth; + public ushort Depth; + public ushort Flags; + + public readonly bool UnpackIsLayered() + { + return (Flags & 1) == 0; + } #pragma warning restore CS0649 } diff --git a/src/Ryujinx.Graphics.Gpu/Image/TextureCache.cs b/src/Ryujinx.Graphics.Gpu/Image/TextureCache.cs index b9ff060e..b6fa842e 100644 --- a/src/Ryujinx.Graphics.Gpu/Image/TextureCache.cs +++ b/src/Ryujinx.Graphics.Gpu/Image/TextureCache.cs @@ -468,13 +468,11 @@ namespace Ryujinx.Graphics.Gpu.Image int gobBlocksInY = dsState.MemoryLayout.UnpackGobBlocksInY(); int gobBlocksInZ = dsState.MemoryLayout.UnpackGobBlocksInZ(); + layered &= size.UnpackIsLayered(); + Target target; - if (dsState.MemoryLayout.UnpackIsTarget3D()) - { - target = Target.Texture3D; - } - else if ((samplesInX | samplesInY) != 1) + if ((samplesInX | samplesInY) != 1) { target = size.Depth > 1 && layered ? Target.Texture2DMultisampleArray |