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

Remove direct render include in ExternalTexture #97279

Merged
merged 1 commit into from
Sep 23, 2024

Conversation

AThousandShips
Copy link
Member

This include introduces windows/platform_gl.h into the include hierarchy which adds defines which break building on MSVC

See:

Related to:

@@ -30,7 +30,6 @@

#include "external_texture.h"

#include "drivers/gles3/storage/texture_storage.h"
Copy link
Member Author

Choose a reason for hiding this comment

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

This include isn't used anywhere here (no GLES3 specific code here) so not sure why it was included, can't test on Android to confirm that this won't break the functionality there but I don't see how it could

@AThousandShips
Copy link
Member Author

I think this and previous incidents implies we should do an SCU build for MSVC (can't confirm if it happens on clang-cl) since these do crop up from time to time

Copy link
Contributor

@dsnopek dsnopek left a comment

Choose a reason for hiding this comment

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

Whoops, sorry! I'm not sure how that snuck in there, because you are right that we don't need it. Thanks for catching it!

This include introduces `windows/platform_gl.h` into the include
hierarchy which adds defines which break building on MSVC
Copy link
Member

@timothyqiu timothyqiu left a comment

Choose a reason for hiding this comment

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

Compiles successfully

@clayjohn clayjohn merged commit 155fcd0 into godotengine:master Sep 23, 2024
19 checks passed
@clayjohn
Copy link
Member

Thank you!

@AThousandShips AThousandShips deleted the fix_gles3_include branch September 23, 2024 06:49
@AThousandShips
Copy link
Member Author

Thank you!

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