diff --git a/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs b/Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs
index 1357c1aae..3b7353c56 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 = 6;
+        private const uint CodeGenVersion = 7;
 
         private const string SharedTocFileName = "shared.toc";
         private const string SharedDataFileName = "shared.data";
diff --git a/Ryujinx.Graphics.Shader/CodeGen/Glsl/OperandManager.cs b/Ryujinx.Graphics.Shader/CodeGen/Glsl/OperandManager.cs
index 21f8f0ee6..74dfd0236 100644
--- a/Ryujinx.Graphics.Shader/CodeGen/Glsl/OperandManager.cs
+++ b/Ryujinx.Graphics.Shader/CodeGen/Glsl/OperandManager.cs
@@ -259,15 +259,7 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Glsl
                         {
                             case AttributeConsts.PositionX: return $"(gl_FragCoord.x / {DefaultNames.SupportBlockRenderScaleName}[0])";
                             case AttributeConsts.PositionY: return $"(gl_FragCoord.y / {DefaultNames.SupportBlockRenderScaleName}[0])";
-                            case AttributeConsts.PositionZ:
-                                if (config.Options.TargetApi == TargetApi.Vulkan && config.GpuAccessor.QueryTransformDepthMinusOneToOne())
-                                {
-                                    return "((gl_FragCoord.z - (gl_FragCoord.w * 0.5)) * 2.0)";
-                                }
-                                else
-                                {
-                                    return "gl_FragCoord.z";
-                                }
+                            case AttributeConsts.PositionZ: return "gl_FragCoord.z";
                             case AttributeConsts.PositionW: return "gl_FragCoord.w";
 
                             case AttributeConsts.FrontFacing:
diff --git a/Ryujinx.Graphics.Shader/CodeGen/Spirv/CodeGenContext.cs b/Ryujinx.Graphics.Shader/CodeGen/Spirv/CodeGenContext.cs
index 187fd2d32..03d26553c 100644
--- a/Ryujinx.Graphics.Shader/CodeGen/Spirv/CodeGenContext.cs
+++ b/Ryujinx.Graphics.Shader/CodeGen/Spirv/CodeGenContext.cs
@@ -348,20 +348,6 @@ namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
 
                     value = FDiv(TypeFP32(), value, scale);
                 }
-                else if (Config.Options.TargetApi == TargetApi.Vulkan &&
-                    attr == AttributeConsts.PositionZ &&
-                    Config.GpuAccessor.QueryTransformDepthMinusOneToOne())
-                {
-                    var constTwo = Constant(TypeFP32(), 2.0f);
-                    var constZeroPointFive = Constant(TypeFP32(), 0.5f);
-
-                    var elemPointerW = GetAttributeElemPointer(AttributeConsts.PositionW, isOutAttr, null, out var elemTypeW);
-                    var valueW = Load(GetType(elemTypeW), elemPointerW);
-
-                    var halfW = FMul(TypeFP32(), valueW, constZeroPointFive);
-
-                    value = FMul(TypeFP32(), FSub(TypeFP32(), value, halfW), constTwo);
-                }
                 else if (attr == AttributeConsts.FrontFacing && Config.GpuAccessor.QueryHostHasFrontFacingBug())
                 {
                     // Workaround for what appears to be a bug on Intel compiler.