From 1758424208335d1f4ff7c27c554e517c81bf72f6 Mon Sep 17 00:00:00 2001
From: gdkchan <gab.dark.100@gmail.com>
Date: Sun, 3 May 2020 18:18:00 -0300
Subject: [PATCH] Use correct swizzle on depth-stencil textures (#1196)
---
Ryujinx.Graphics.Gpu/Image/TexturePool.cs | 36 +++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/Ryujinx.Graphics.Gpu/Image/TexturePool.cs b/Ryujinx.Graphics.Gpu/Image/TexturePool.cs
index a4f54c5206..f81c67ef75 100644
--- a/Ryujinx.Graphics.Gpu/Image/TexturePool.cs
+++ b/Ryujinx.Graphics.Gpu/Image/TexturePool.cs
@@ -179,6 +179,22 @@ namespace Ryujinx.Graphics.Gpu.Image
swizzleB,
swizzleA);
+ if (IsDepthStencil(formatInfo.Format))
+ {
+ swizzleR = SwizzleComponent.Red;
+ swizzleG = SwizzleComponent.Red;
+ swizzleB = SwizzleComponent.Red;
+
+ if (depthStencilMode == DepthStencilMode.Depth)
+ {
+ swizzleA = SwizzleComponent.One;
+ }
+ else
+ {
+ swizzleA = SwizzleComponent.Red;
+ }
+ }
+
return new TextureInfo(
address,
width,
@@ -252,6 +268,26 @@ namespace Ryujinx.Graphics.Gpu.Image
component == SwizzleComponent.Green;
}
+ /// <summary>
+ /// Checks if the texture format is a depth, stencil or depth-stencil format.
+ /// </summary>
+ /// <param name="format">Texture format</param>
+ /// <returns>True if the format is a depth, stencil or depth-stencil format, false otherwise</returns>
+ private static bool IsDepthStencil(Format format)
+ {
+ switch (format)
+ {
+ case Format.D16Unorm:
+ case Format.D24UnormS8Uint:
+ case Format.D24X8Unorm:
+ case Format.D32Float:
+ case Format.D32FloatS8Uint:
+ return true;
+ }
+
+ return false;
+ }
+
/// <summary>
/// Decrements the reference count of the texture.
/// This indicates that the texture pool is not using it anymore.