Merge pull request #29993 from bruvzg/vulkan

Initial Vulkan support for macOS (MoltenVK) and Windows
This commit is contained in:
Rémi Verschelde 2019-07-29 20:44:14 +02:00 committed by GitHub
commit 6289e7d147
125 changed files with 142783 additions and 1069 deletions

View file

@ -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";
}
}

View file

@ -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,
};