Skip to content

Commit

Permalink
[macOS/Windows] Add optional ANGLE backed OpenGL renderer support. Ad…
Browse files Browse the repository at this point in the history
…d EGL_ANDROID_blob_cache caching.

Co-authored-by: Riteo <riteo@posteo.net>
  • Loading branch information
bruvzg and Riteo committed Sep 21, 2023
1 parent 59139df commit 1887a9d
Show file tree
Hide file tree
Showing 84 changed files with 7,452 additions and 564 deletions.
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"])

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")

0 comments on commit 1887a9d

Please sign in to comment.