Merge pull request #5979 from smoogipoo/remove-blur-shader-hack

Remove now unnecessary blur shader workaround
ppy · Aug 23, 2023 · 091a670 · 091a670
2 parents 08fd5fa + 8864d3b
commit 091a670
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/osu.Framework/Resources/Shaders/sh_Blur.fs b/osu.Framework/Resources/Shaders/sh_Blur.fs
@@ -44,10 +44,7 @@ lowp vec4 blur(int radius, highp vec2 direction, mediump vec2 texCoord, mediump
 			break;
 	}
 
-	// todo: workaround for a SPIR-V bug (https://github.com/ppy/osu-framework/issues/5719)
-	float one = g_BackbufferDraw ? 0 : 1;
-
-	return sum / totalFactor * one;
+	return sum / totalFactor;
 }
 
 void main(void)

diff --git a/osu.Framework/osu.Framework.csproj b/osu.Framework/osu.Framework.csproj
@@ -28,7 +28,7 @@
     <PackageReference Include="ppy.ManagedBass.Fx" Version="2022.1216.0" />
     <PackageReference Include="ppy.ManagedBass.Mix" Version="2022.1216.0" />
     <PackageReference Include="ppy.Veldrid" Version="4.9.3-g91ce5a6cda" />
-    <PackageReference Include="ppy.Veldrid.SPIRV" Version="1.0.15-g3baeeeecc6" />
+    <PackageReference Include="ppy.Veldrid.SPIRV" Version="1.0.15-ge24108e71c" />
     <PackageReference Include="SharpFNT" Version="2.0.0" />
     <!-- Preview version of ImageSharp causes NU5104. -->
     <PackageReference Include="SixLabors.ImageSharp" Version="2.1.0" />