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.

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

Don't force fs and vs shader file extension if shader load argument string already includes file extension #6514

Merged
merged 5 commits into from
Jan 29, 2025

Conversation

BashhScriptKid
Copy link
Contributor

This should allow shader files to be loaded, regardless of filename extension, as long as it's specified when using dependency injection. Otherwise, default to vs and fs for vertex and fragment shader respectively. ("sh_" prefix is still required)
The exception message is updated as well.

This might be a small change that might not matter to a lot of people since they can just follow as instructed and use the hardcoded filename extension, but it doesn't feel right to force people to accept on someone else's preference on something subjective IMO

Copy link
Member

@peppy peppy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably fine

osu.Framework/Graphics/Shaders/ShaderManager.cs Outdated Show resolved Hide resolved
@peppy peppy enabled auto-merge January 29, 2025 03:36
@BashhScriptKid
Copy link
Contributor Author

https://github.com/ppy/osu-framework/actions/runs/13024083461/job/36330312104?pr=6514#step:8:33

It doesn't seem to be related to my changes, as far as I've looked into the stack trace there?

@smoogipoo smoogipoo disabled auto-merge January 29, 2025 04:33
@smoogipoo smoogipoo merged commit 6b49cbd into ppy:master Jan 29, 2025
12 of 14 checks passed
@BashhScriptKid BashhScriptKid deleted the allow-customShaderExt branch January 29, 2025 04:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants