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

GS: Update lottes crt shader. #11783

Merged
merged 1 commit into from
Sep 19, 2024
Merged

Conversation

stuken
Copy link
Contributor

@stuken stuken commented Sep 6, 2024

Description of Changes

Updates lottes crt to be in line the latest version.

Rationale behind Changes

The original gs.fx version that was the basis of the old shader is fairly old and missing a couple of features added in later revisions. This just brings thing inline with the more recent past. Shadow mask is more pronounced now and there is a subtle bloom pass.
Old:
lottes_old
New:
lottes_new

Suggested Testing Steps

Tested against dx/opengl/vulkan locally with no issues. Metal is untested.

@AmyRoxwell
Copy link

PR works on linux, although...Maybe there could be abetter way to do it? cuz It seems to be pretty dark and muting the colors a lot, specially bright ones compared to the old one:

MH2DOS: (Left is Master, Right is PR, not using shade boost at all)

Screenshot_20240906_212218
Screenshot_20240906_211845
Screenshot_20240906_211827
Screenshot_20240906_211752
Screenshot_20240906_211349
Screenshot_20240906_211334
Screenshot_20240906_211230
Screenshot_20240906_211222
Screenshot_20240906_211158
Screenshot_20240906_211145
Screenshot_20240906_211126
Screenshot_20240906_211051

@lightningterror
Copy link
Contributor

@stuken Any update on the brightness suggestions so it can match master?

Copy link
Contributor

@lightningterror lightningterror left a comment

Choose a reason for hiding this comment

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

Need to bump shader cache in ShaderCacheVersion.h.

@stuken
Copy link
Contributor Author

stuken commented Sep 18, 2024

The old one did not follow the defaults with the mask values set too low. Things are now in line with the reshade and libretro slang/glsl implementations aside from the removal of the brightboost param which can be user configured with shade boost and the mask set to 4 as that's just my personal preference. see https://github.com/Zackin5/Misc-ReShade-Shaders/blob/master/CRT-Lottes.fx#L61C1-L73C9
https://github.com/libretro/glsl-shaders/blob/master/crt/shaders/crt-lottes.glsl#L19C1-L20C56

Bumped the shader cache version.

Copy link
Contributor

@lightningterror lightningterror left a comment

Choose a reason for hiding this comment

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

Some new shader warnings need to be addressed too, these are on dx, others seem fine?

ps_5_0' compiled with warnings:
(158,36-64): warning X3571: pow(f, e) will not work for negative f, use abs(f) or conditionally handle negative values if you expect them
(168,45-59): warning X3571: pow(f, e) will not work for negative f, use abs(f) or conditionally handle negative values if you expect them
(431,26-42): warning X3578: Output value 'ps_filter_lottes' is not completely initialized

Copy link
Contributor

@lightningterror lightningterror left a comment

Choose a reason for hiding this comment

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

Looks good now.

@lightningterror lightningterror merged commit 217e1c8 into PCSX2:master Sep 19, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants