From fd188ddd5176390efb22ed041d8aedad25d81dee Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Fri, 7 Jun 2019 13:07:57 -0300 Subject: Initial work on Vulkan: -Added VulkanContext -Added an X11 implementation -Added a rendering device abstraction -added a Vulkan rendering device abstraction -Engine does not work, only shows Godot logo (run it from bin/) --- platform/x11/detect.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'platform/x11/detect.py') diff --git a/platform/x11/detect.py b/platform/x11/detect.py index bd5e5e0812..5f43d19151 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -318,7 +318,9 @@ def configure(env): env.ParseConfig('pkg-config zlib --cflags --libs') env.Prepend(CPPPATH=['#platform/x11']) - env.Append(CPPDEFINES=['X11_ENABLED', 'UNIX_ENABLED', 'OPENGL_ENABLED', 'GLES_ENABLED']) + env.Append(CPPDEFINES=['X11_ENABLED', 'UNIX_ENABLED']) + env.Append(CPPDEFINES=['VULKAN_ENABLED']) + env.Append(LIBS=['vulkan']) env.Append(LIBS=['GL', 'pthread']) if (platform.system() == "Linux"): -- cgit v1.2.3 From eb48be51dbe97aa4fbbbe0d0ebd8a98bee6b263e Mon Sep 17 00:00:00 2001 From: bruvzg <7645683+bruvzg@users.noreply.github.com> Date: Sat, 22 Jun 2019 19:34:26 +0300 Subject: Add static Vulkan loader. Initial Vulkan support for Windows. Initial Vulkan support for macOS. --- platform/x11/detect.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'platform/x11/detect.py') diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 5f43d19151..eee439ceb4 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -319,9 +319,17 @@ def configure(env): env.Prepend(CPPPATH=['#platform/x11']) env.Append(CPPDEFINES=['X11_ENABLED', 'UNIX_ENABLED']) - env.Append(CPPDEFINES=['VULKAN_ENABLED']) - env.Append(LIBS=['vulkan']) - env.Append(LIBS=['GL', 'pthread']) + + if (env["renderer"] == "vulkan"): + env.Prepend(CPPPATH=['#thirdparty/vulkan/include/', "#thirdparty/vulkan/registry/"]) + env.Append(CPPDEFINES=['VULKAN_ENABLED']) + if not env["builtin_vulkan_loader"]: + env.Append(LIBS=['vulkan']) + else: + env.Append(CPPDEFINES=['OPENGL_ENABLED']) + env.Append(LIBS=['GL']) + + env.Append(LIBS=['pthread']) if (platform.system() == "Linux"): env.Append(LIBS=['dl']) -- cgit v1.2.3 From b456bfad5cee3922f55621bf7c133cc67337636a Mon Sep 17 00:00:00 2001 From: bruvzg <7645683+bruvzg@users.noreply.github.com> Date: Fri, 12 Jul 2019 16:18:30 +0300 Subject: Add runtime GLES2 / Vulkan context selection. --- platform/x11/detect.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'platform/x11/detect.py') diff --git a/platform/x11/detect.py b/platform/x11/detect.py index eee439ceb4..ed48fbb74a 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -320,14 +320,13 @@ def configure(env): env.Prepend(CPPPATH=['#platform/x11']) env.Append(CPPDEFINES=['X11_ENABLED', 'UNIX_ENABLED']) - if (env["renderer"] == "vulkan"): - env.Prepend(CPPPATH=['#thirdparty/vulkan/include/', "#thirdparty/vulkan/registry/"]) - env.Append(CPPDEFINES=['VULKAN_ENABLED']) - if not env["builtin_vulkan_loader"]: - env.Append(LIBS=['vulkan']) - else: - env.Append(CPPDEFINES=['OPENGL_ENABLED']) - env.Append(LIBS=['GL']) + env.Prepend(CPPPATH=['#thirdparty/vulkan/include/', "#thirdparty/vulkan/registry/"]) + env.Append(CPPDEFINES=['VULKAN_ENABLED']) + if not env["builtin_vulkan_loader"]: + env.Append(LIBS=['vulkan']) + + #env.Append(CPPDEFINES=['OPENGL_ENABLED']) + env.Append(LIBS=['GL']) env.Append(LIBS=['pthread']) -- cgit v1.2.3 From 511f65214fcc95011525e2f23e4d1be7cd7b8731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Mon, 5 Aug 2019 11:48:54 +0200 Subject: SCons: Streamline Vulkan buildsystem + fixups - Renamed option to `builtin_vulkan`, since that's the name of the library and if we were to add new components, we'd likely use that same option. - Merge `vulkan_loader/SCsub` in `vulkan/SCsub`. - Accordingly, don't use built-in Vulkan headers when not building against the built-in loader library. - Drop Vulkan registry which we don't appear to need currently. - Style and permission fixes. --- platform/x11/detect.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'platform/x11/detect.py') diff --git a/platform/x11/detect.py b/platform/x11/detect.py index ed48fbb74a..ddb3af79f8 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -320,10 +320,9 @@ def configure(env): env.Prepend(CPPPATH=['#platform/x11']) env.Append(CPPDEFINES=['X11_ENABLED', 'UNIX_ENABLED']) - env.Prepend(CPPPATH=['#thirdparty/vulkan/include/', "#thirdparty/vulkan/registry/"]) env.Append(CPPDEFINES=['VULKAN_ENABLED']) - if not env["builtin_vulkan_loader"]: - env.Append(LIBS=['vulkan']) + if not env['builtin_vulkan']: + env.ParseConfig('pkg-config vulkan --cflags --libs') #env.Append(CPPDEFINES=['OPENGL_ENABLED']) env.Append(LIBS=['GL']) -- cgit v1.2.3 From 65ad12e79ae17c72e04af03371ac32df7e37f229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 27 Sep 2019 09:39:53 +0200 Subject: glslang: Disable warnings and allow unbundling --- platform/x11/detect.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'platform/x11/detect.py') diff --git a/platform/x11/detect.py b/platform/x11/detect.py index ddb3af79f8..9d5affcb3c 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -323,6 +323,9 @@ def configure(env): env.Append(CPPDEFINES=['VULKAN_ENABLED']) if not env['builtin_vulkan']: env.ParseConfig('pkg-config vulkan --cflags --libs') + if not env['builtin_glslang']: + # No pkgconfig file for glslang so far + env.Append(LIBS=['glslang', 'SPIRV']) #env.Append(CPPDEFINES=['OPENGL_ENABLED']) env.Append(LIBS=['GL']) -- cgit v1.2.3