diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-29 20:44:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-11 11:57:40 +0100 |
| commit | 6289e7d1479f6e7c9e55890c8c66d2e5e0a1481a (patch) | |
| tree | 8223d907b1aa8184295240a7b6f63023da05c02f /core | |
| parent | 6ecedd1e6ca7d8b10b13a3dab19074fd51b17bcf (diff) | |
| parent | b456bfad5cee3922f55621bf7c133cc67337636a (diff) | |
Merge pull request #29993 from bruvzg/vulkan
Initial Vulkan support for macOS (MoltenVK) and Windows
Diffstat (limited to 'core')
| -rw-r--r-- | core/bind/core_bind.h | 1 | ||||
| -rw-r--r-- | core/os/os.cpp | 4 | ||||
| -rw-r--r-- | core/os/os.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h index 955375cc99..015bcd965e 100644 --- a/core/bind/core_bind.h +++ b/core/bind/core_bind.h @@ -106,6 +106,7 @@ public: enum VideoDriver { VIDEO_DRIVER_GLES3, VIDEO_DRIVER_GLES2, + VIDEO_DRIVER_VULKAN, }; enum PowerState { diff --git a/core/os/os.cpp b/core/os/os.cpp index 7e5c9d6ef8..13be4a5c37 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -691,9 +691,9 @@ const char *OS::get_video_driver_name(int p_driver) const { switch (p_driver) { case VIDEO_DRIVER_GLES2: return "GLES2"; - case VIDEO_DRIVER_GLES3: + case VIDEO_DRIVER_VULKAN: default: - return "GLES3"; + return "Vulkan"; } } diff --git a/core/os/os.h b/core/os/os.h index 89b3414b3e..1bb910cb0d 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -181,7 +181,7 @@ public: virtual void get_fullscreen_mode_list(List<VideoMode> *p_list, int p_screen = 0) const = 0; enum VideoDriver { - VIDEO_DRIVER_GLES3, + VIDEO_DRIVER_VULKAN, VIDEO_DRIVER_GLES2, VIDEO_DRIVER_MAX, }; |