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

[macOS/Windows] Add optional ANGLE backed OpenGL renderer support (runtime backend selection). #72831

Merged
merged 1 commit into from Sep 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions COPYRIGHT.txt
Expand Up @@ -141,6 +141,11 @@ Comment: AMD FidelityFX Super Resolution
Copyright: 2021, Advanced Micro Devices, Inc.
License: Expat

Files: ./thirdparty/angle/
Comment: ANGLE
Copyright: 2018, The ANGLE Project Authors.
License: BSD-3-clause

Files: ./thirdparty/astcenc/
Comment: Arm ASTC Encoder
Copyright: 2011-2023, Arm Limited
Expand Down
2 changes: 2 additions & 0 deletions SConstruct
Expand Up @@ -579,6 +579,8 @@ if selected_platform in platform_list:
if env["debug_symbols"]:
env.Append(CCFLAGS=["/Zi", "/FS"])
env.Append(LINKFLAGS=["/DEBUG:FULL"])
else:
env.Append(LINKFLAGS=["/DEBUG:NONE"])
Comment on lines +582 to +583
Copy link
Member

Choose a reason for hiding this comment

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

Might be worth moving to a separate PR so it can be cherry-picked. Also relevant to propagate in godot-cpp.

I assume this means /DEBUG:NONE is not the default option when no /DEBUG is specified?


if env["optimize"] == "speed":
env.Append(CCFLAGS=["/O2"])
Expand Down
4 changes: 2 additions & 2 deletions doc/classes/DisplayServer.xml
Expand Up @@ -1891,9 +1891,9 @@
</constant>
<constant name="OPENGL_CONTEXT" value="3" enum="HandleType">
OpenGL context (only with the GL Compatibility renderer):
- Windows: [code]HGLRC[/code] for the window.
- Windows: [code]HGLRC[/code] for the window (native GL), or [code]EGLContext[/code] for the window (ANGLE).
- Linux: [code]GLXContext*[/code] for the window.
- macOS: [code]NSOpenGLContext*[/code] for the window.
- macOS: [code]NSOpenGLContext*[/code] for the window (native GL), or [code]EGLContext[/code] for the window (ANGLE).
- Android: [code]EGLContext[/code] for the window.
</constant>
<constant name="TTS_UTTERANCE_STARTED" value="0" enum="TTSUtteranceEvent">
Expand Down
1 change: 1 addition & 0 deletions drivers/SCsub
Expand Up @@ -28,6 +28,7 @@ if env["vulkan"]:
if env["opengl3"]:
SConscript("gl_context/SCsub")
SConscript("gles3/SCsub")
SConscript("egl/SCsub")

# Core dependencies
SConscript("png/SCsub")
Expand Down
6 changes: 6 additions & 0 deletions drivers/egl/SCsub
@@ -0,0 +1,6 @@
#!/usr/bin/env python

Import("env")

# Godot source files
env.add_source_files(env.drivers_sources, "*.cpp")