Fix unreachable code in lightmap_gi.cpp
#98201
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AThousandShips
changed the title
lightmap_gi.cpplightmap_gi.cpp
This comment was marked as outdated.
This comment was marked as outdated.
AThousandShips
force-pushed
the
lightmap_compile_fix
branch
from
51f5b3a to
de12881
Compare
AThousandShips
commented
Oct 15, 2024
Comment on lines
+1610
to
+1614
| #elif defined(ANDROID_ENABLED) || defined(IOS_ENABLED) | ||
| warnings.push_back(vformat(RTR("Lightmaps cannot be baked on %s. Rendering existing baked lightmaps will still work."), OS::get_singleton()->get_name())); | ||
| #else | ||
| warnings.push_back(RTR("Lightmaps cannot be baked, as the `lightmapper_rd` module was disabled at compile-time. Rendering existing baked lightmaps will still work.")); | ||
| #endif |
There was a problem hiding this comment.
Simplified this, can keep it as its own separate block like so if desired:
Suggested change
| #elif defined(ANDROID_ENABLED) || defined(IOS_ENABLED) | |
| warnings.push_back(vformat(RTR("Lightmaps cannot be baked on %s. Rendering existing baked lightmaps will still work."), OS::get_singleton()->get_name())); | |
| #else | |
| warnings.push_back(RTR("Lightmaps cannot be baked, as the `lightmapper_rd` module was disabled at compile-time. Rendering existing baked lightmaps will still work.")); | |
| #endif | |
| #else // MODULE_LIGHTMAPPER_RD_ENABLED | |
| #if defined(ANDROID_ENABLED) || defined(IOS_ENABLED) | |
| warnings.push_back(vformat(RTR("Lightmaps cannot be baked on %s. Rendering existing baked lightmaps will still work."), OS::get_singleton()->get_name())); | |
| #else | |
| warnings.push_back(RTR("Lightmaps cannot be baked, as the `lightmapper_rd` module was disabled at compile-time. Rendering existing baked lightmaps will still work.")); | |
| #endif // defined(ANDROID_ENABLED) || defined(IOS_ENABLED) | |
| #endif // MODULE_LIGHTMAPPER_RD_ENABLED |
Repiteo
approved these changes
Oct 19, 2024
huwpascoe
suggested changes
Oct 19, 2024
huwpascoe
reviewed
Oct 19, 2024
| return warnings; | ||
| #endif | ||
|
|
||
| #ifdef MODULE_LIGHTMAPPER_RD_ENABLED | ||
| if (!DisplayServer::get_singleton()->can_create_rendering_device()) { | ||
| warnings.push_back(vformat(RTR("Lightmaps can only be baked from a GPU that supports the RenderingDevice backends.\nYour GPU (%s) does not support RenderingDevice, as it does not support Vulkan, Direct3D 12, or Metal.\nLightmap baking will not be available on this device, although rendering existing baked lightmaps will work."), RenderingServer::get_singleton()->get_video_adapter_name())); | ||
| return warnings; |
There was a problem hiding this comment.
I'd rather leave it for a separate cleanup, this is just for the sake of ensuring building, but good catch
There was a problem hiding this comment.
Ok then looks good to merge.
|
Thanks! |
|
Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Regression from:
Seems specific to SCU builds, completely missed when reviewing