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.
---
 editor/editor_node.cpp                       | 2 ++
 editor/import/editor_scene_importer_gltf.cpp | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'editor')

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];
-- 
cgit v1.2.3