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

OS_LinuxBSD: Add missing RenderServer include for get_video_adapter_driver_info #88525

Merged
merged 1 commit into from
Feb 19, 2024

Conversation

LinuxUserGD
Copy link
Contributor

closes #88524

@LinuxUserGD LinuxUserGD requested a review from a team as a code owner February 18, 2024 23:46
@akien-mga akien-mga changed the title os_linuxbsd.cpp: return empty Vector if RenderingServer is not defined Linux: Fix get_video_adapter_driver_info compilation if RenderingServer is undefined Feb 18, 2024
@akien-mga
Copy link
Member

That doesn't seem to be the right fix. RenderingServer is always compiled, regardless of options. The problem here is simply that it's not properly included in this file, and only happens to be usually there as a transitive include brought by another one (likely the X11 and Wayland display servers).

So the proper fix is to include servers/rendering_server.h in this file.

@LinuxUserGD
Copy link
Contributor Author

So the proper fix is to include servers/rendering_server.h in this file.

Ok, updated the PR accordingly (which compiles with the build options)

@akien-mga akien-mga changed the title Linux: Fix get_video_adapter_driver_info compilation if RenderingServer is undefined Linux: Add missing RenderServer include for get_video_adapter_driver_info Feb 19, 2024
@akien-mga akien-mga changed the title Linux: Add missing RenderServer include for get_video_adapter_driver_info OS_LinuxBSD: Add missing RenderServer include for get_video_adapter_driver_info Feb 19, 2024
@akien-mga akien-mga added the cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release label Feb 19, 2024
@akien-mga akien-mga merged commit ae51db7 into godotengine:master Feb 19, 2024
15 checks passed
@akien-mga
Copy link
Member

Thanks!

@LinuxUserGD LinuxUserGD deleted the RenderingServer branch February 19, 2024 00:29
@akien-mga akien-mga added the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Mar 9, 2024
@akien-mga
Copy link
Member

Cherry-picked for 4.2.2.
Cherry-picked for 4.1.4.

@akien-mga akien-mga removed cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release labels Mar 9, 2024
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.

Linux headless template_release build: use of undeclared identifier 'RenderingServer'
2 participants