diff options
| author | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2019-06-22 19:34:26 +0300 |
|---|---|---|
| committer | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2020-02-11 11:57:11 +0100 |
| commit | eb48be51dbe97aa4fbbbe0d0ebd8a98bee6b263e (patch) | |
| tree | 9a5b6bfd50e7ddb5b348c97bd60d30b290d27d49 /editor | |
| parent | 4fe3ee1730167b90ec8ae70c871c1dad032981d5 (diff) | |
Add static Vulkan loader.
Initial Vulkan support for Windows.
Initial Vulkan support for macOS.
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_node.cpp | 2 | ||||
| -rw-r--r-- | editor/import/editor_scene_importer_gltf.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 58ddc61b9f..856bfe5f44 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -5350,6 +5350,8 @@ void EditorNode::_update_video_driver_color() { video_driver->add_color_override("font_color", Color::hex(0x5586a4ff)); } else if (video_driver->get_text() == "GLES3") { video_driver->add_color_override("font_color", Color::hex(0xa5557dff)); + } else if (video_driver->get_text() == "Vulkan") { + video_driver->add_color_override("font_color", Color::hex(0xad1128ff)); } } diff --git a/editor/import/editor_scene_importer_gltf.cpp b/editor/import/editor_scene_importer_gltf.cpp index 419f007cec..3239cadbe4 100644 --- a/editor/import/editor_scene_importer_gltf.cpp +++ b/editor/import/editor_scene_importer_gltf.cpp @@ -989,7 +989,9 @@ Error EditorSceneImporterGLTF::_parse_meshes(GLTFState &state) { Mesh::PRIMITIVE_TRIANGLES, Mesh::PRIMITIVE_TRIANGLES, Mesh::PRIMITIVE_TRIANGLES, +#ifndef _MSC_VER #warning these will have to be decomposed into proper primitive now that lineloop/strip,etc no longer supported +#endif }; primitive = primitives2[mode]; |