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:OGL:Shaders: Formatting #8650

Merged
merged 2 commits into from
Apr 30, 2023
Merged

Conversation

TellowKrinkle
Copy link
Member

Description of Changes

Less aggressive version of #8648

Rationale behind Changes

Our GLSL shaders have a lot of nested ifdefs which are incredibly confusing with the default clang-format formatting

Suggested Testing Steps

Test OpenGL things

@stenzek
Copy link
Member

stenzek commented Apr 13, 2023

This is going to conflict with #8613, and in a nasty way (I removed the GS completely).

@TellowKrinkle TellowKrinkle marked this pull request as draft April 13, 2023 07:42
@lightningterror
Copy link
Contributor

This is going to conflict with #8613, and in a nasty way (I removed the GS completely).

I forgot that wasn't merged yet.

@lightningterror
Copy link
Contributor

I'll go ahead and merge this, other formatting stuff can be done at a later time.

@lightningterror lightningterror merged commit e221d31 into PCSX2:master Apr 30, 2023
11 checks passed
@TellowKrinkle TellowKrinkle deleted the OGLShaderFormat branch May 2, 2023 02:06
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.

None yet

6 participants