Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove now unnecessary blur shader workaround #5979

Merged
merged 3 commits into from
Aug 23, 2023
Merged

Remove now unnecessary blur shader workaround #5979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f16b541
Remove now unnecessary blur shader workaround
smoogipoo Aug 22, 2023
2c0eceb
Merge branch 'master' into remove-blur-shader-hack
peppy Aug 23, 2023
8864d3b
Update SPIRV to latest package version
peppy Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions osu.Framework/Resources/Shaders/sh_Blur.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion osu.Framework/osu.Framework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Loading