From ed0b10c81f1e9133c8e24beb5efd824c6bce4470 Mon Sep 17 00:00:00 2001 From: gdkchan Date: Tue, 2 Aug 2022 03:44:30 -0300 Subject: [PATCH] Fix geometry shader passthrough fallback being used when feature is supported (#3525) * Fix geometry shader passthrough fallback being used when feature is supported * Shader cache version bump --- Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs | 2 +- Ryujinx.Graphics.Shader/Translation/EmitterContext.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs b/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs index d15820b0b7..e66d5d6f8c 100644 --- a/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs +++ b/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs @@ -22,7 +22,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache private const ushort FileFormatVersionMajor = 1; private const ushort FileFormatVersionMinor = 2; private const uint FileFormatVersionPacked = ((uint)FileFormatVersionMajor << 16) | FileFormatVersionMinor; - private const uint CodeGenVersion = 14; + private const uint CodeGenVersion = 3525; private const string SharedTocFileName = "shared.toc"; private const string SharedDataFileName = "shared.data"; diff --git a/Ryujinx.Graphics.Shader/Translation/EmitterContext.cs b/Ryujinx.Graphics.Shader/Translation/EmitterContext.cs index 5182324090..e8b682d0b6 100644 --- a/Ryujinx.Graphics.Shader/Translation/EmitterContext.cs +++ b/Ryujinx.Graphics.Shader/Translation/EmitterContext.cs @@ -248,7 +248,7 @@ namespace Ryujinx.Graphics.Shader.Translation this.Copy(Attribute(index + 12), w); } - if (Config.GpPassthrough) + if (Config.GpPassthrough && !Config.GpuAccessor.QueryHostSupportsGeometryShaderPassthrough()) { int inputVertices = Config.GpuAccessor.QueryPrimitiveTopology().ToInputVertices();