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

Betsy: Consolidate documentation in module folder and cleanup SCsub #102264

Merged
merged 1 commit into from
Feb 6, 2025

Conversation

akien-mga
Copy link
Member

Also remove unused UavCrossPlatform_piece_all.glsl.

COPYRIGHT.txt Outdated
Comment on lines 64 to 68
Files: modules/betsy/bc1.glsl
modules/betsy/bc4.glsl
modules/betsy/bc6h.glsl
modules/betsy/CrossPlatformSettings_piece_all.glsl
Copy link
Member Author

Choose a reason for hiding this comment

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

I didn't include alpha_stitch.glsl which I don't see upstream, so I assume we wrote it.

Copy link
Contributor

Choose a reason for hiding this comment

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

It's based on etc2_rgba_stitch.glsl from upstream

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks, adding it too then.

Also remove unused `UavCrossPlatform_piece_all.glsl`.
Copy link
Contributor

@BlueCube3310 BlueCube3310 left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@clayjohn clayjohn 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 to me!

@@ -1,16 +0,0 @@
#define OGRE_imageLoad2D(inImage, iuv) imageLoad(inImage, int2(iuv))
Copy link
Member

Choose a reason for hiding this comment

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

This reminds me, we should also remove CrossPlatformSettings_piece_all.glsl and just use GLSL directly throughout. There isn't a good reason for us to keep using the defines from Ogre

@BlueCube3310 Do you want to work on that for 4.5?

Copy link
Contributor

Choose a reason for hiding this comment

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

I could do that, yes

@clayjohn clayjohn modified the milestones: 4.x, 4.5 Feb 1, 2025
@akien-mga akien-mga added the cherrypick:4.4 Considered for cherry-picking into a future 4.4.x release label Feb 2, 2025
@akien-mga akien-mga modified the milestones: 4.5, 4.4 Feb 5, 2025
@akien-mga akien-mga removed the cherrypick:4.4 Considered for cherry-picking into a future 4.4.x release label Feb 5, 2025
@akien-mga
Copy link
Member Author

Since this is just a documentation update, I think it would be good to merge for 4.4 alongside #102242 so we have a well consolidated documentation for thirdparty code in the 4.4 branch.

@Repiteo Repiteo merged commit d3967e9 into godotengine:master Feb 6, 2025
19 checks passed
@Repiteo
Copy link
Contributor

Repiteo commented Feb 6, 2025

Thanks!

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.

5 participants