[drape] Refactored context access in textures, fixed iOS compilation

5 files changed, 330 insertions, 3 deletions

diff --git a/xcode/drape/drape.xcodeproj/project.pbxproj b/xcode/drape/drape.xcodeproj/project.pbxproj
index df8dbfd1bf..fd2a47df83 100644
--- a/xcode/drape/drape.xcodeproj/project.pbxproj
+++ b/xcode/drape/drape.xcodeproj/project.pbxproj
@@ -22,6 +22,22 @@
 		4560F5A52142890600CC736C /* metal_gpu_buffer_impl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4560F5A42142890600CC736C /* metal_gpu_buffer_impl.mm */; };
 		4560F5A7214297D800CC736C /* metal_vertex_array_buffer_impl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4560F5A6214297D800CC736C /* metal_vertex_array_buffer_impl.mm */; };
 		4560F5A92142A17B00CC736C /* metal_gpu_buffer_impl.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4560F5A82142A17B00CC736C /* metal_gpu_buffer_impl.hpp */; };
+		4577B25421F2035D00864FAC /* vulkan_gpu_buffer_impl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4577B24421F2035C00864FAC /* vulkan_gpu_buffer_impl.cpp */; };
+		4577B25521F2035D00864FAC /* vulkan_texture.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4577B24521F2035C00864FAC /* vulkan_texture.hpp */; };
+		4577B25621F2035D00864FAC /* vulkan_utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4577B24621F2035C00864FAC /* vulkan_utils.cpp */; };
+		4577B25721F2035D00864FAC /* vulkan_vertex_array_buffer_impl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4577B24721F2035C00864FAC /* vulkan_vertex_array_buffer_impl.cpp */; };
+		4577B25821F2035D00864FAC /* vulkan_layers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4577B24821F2035C00864FAC /* vulkan_layers.hpp */; };
+		4577B25921F2035D00864FAC /* vulkan_gpu_program.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4577B24921F2035C00864FAC /* vulkan_gpu_program.hpp */; };
+		4577B25A21F2035D00864FAC /* vulkan_texture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4577B24A21F2035C00864FAC /* vulkan_texture.cpp */; };
+		4577B25B21F2035D00864FAC /* vulkan_memory_manager.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4577B24B21F2035C00864FAC /* vulkan_memory_manager.hpp */; };
+		4577B25C21F2035D00864FAC /* vulkan_gpu_buffer_impl.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4577B24C21F2035C00864FAC /* vulkan_gpu_buffer_impl.hpp */; };
+		4577B25D21F2035D00864FAC /* vulkan_layers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4577B24D21F2035C00864FAC /* vulkan_layers.cpp */; };
+		4577B25E21F2035D00864FAC /* vulkan_base_context.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4577B24E21F2035C00864FAC /* vulkan_base_context.hpp */; };
+		4577B25F21F2035D00864FAC /* vulkan_utils.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4577B24F21F2035D00864FAC /* vulkan_utils.hpp */; };
+		4577B26021F2035D00864FAC /* vulkan_mesh_object_impl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4577B25021F2035D00864FAC /* vulkan_mesh_object_impl.cpp */; };
+		4577B26121F2035D00864FAC /* vulkan_base_context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4577B25121F2035D00864FAC /* vulkan_base_context.cpp */; };
+		4577B26221F2035D00864FAC /* vulkan_memory_manager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4577B25221F2035D00864FAC /* vulkan_memory_manager.cpp */; };
+		4577B26321F2035D00864FAC /* vulkan_device_holder.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4577B25321F2035D00864FAC /* vulkan_device_holder.hpp */; };
 		45789ED72133DFC2009955CC /* metal_base_context.mm in Sources */ = {isa = PBXBuildFile; fileRef = 45789ED52133DFC2009955CC /* metal_base_context.mm */; };
 		45789EDA2133E14F009955CC /* metal_base_context.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 45789ED92133E14F009955CC /* metal_base_context.hpp */; };
 		45789EF2213557F7009955CC /* gl_constants.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 45789EE9213557F4009955CC /* gl_constants.hpp */; };
@@ -146,6 +162,22 @@
 		4560F5A42142890600CC736C /* metal_gpu_buffer_impl.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = metal_gpu_buffer_impl.mm; sourceTree = "<group>"; };
 		4560F5A6214297D800CC736C /* metal_vertex_array_buffer_impl.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = metal_vertex_array_buffer_impl.mm; sourceTree = "<group>"; };
 		4560F5A82142A17B00CC736C /* metal_gpu_buffer_impl.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = metal_gpu_buffer_impl.hpp; sourceTree = "<group>"; };
+		4577B24421F2035C00864FAC /* vulkan_gpu_buffer_impl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = vulkan_gpu_buffer_impl.cpp; path = ../vulkan/vulkan_gpu_buffer_impl.cpp; sourceTree = "<group>"; };
+		4577B24521F2035C00864FAC /* vulkan_texture.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = vulkan_texture.hpp; path = ../vulkan/vulkan_texture.hpp; sourceTree = "<group>"; };
+		4577B24621F2035C00864FAC /* vulkan_utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = vulkan_utils.cpp; path = ../vulkan/vulkan_utils.cpp; sourceTree = "<group>"; };
+		4577B24721F2035C00864FAC /* vulkan_vertex_array_buffer_impl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = vulkan_vertex_array_buffer_impl.cpp; path = ../vulkan/vulkan_vertex_array_buffer_impl.cpp; sourceTree = "<group>"; };
+		4577B24821F2035C00864FAC /* vulkan_layers.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = vulkan_layers.hpp; path = ../vulkan/vulkan_layers.hpp; sourceTree = "<group>"; };
+		4577B24921F2035C00864FAC /* vulkan_gpu_program.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = vulkan_gpu_program.hpp; path = ../vulkan/vulkan_gpu_program.hpp; sourceTree = "<group>"; };
+		4577B24A21F2035C00864FAC /* vulkan_texture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = vulkan_texture.cpp; path = ../vulkan/vulkan_texture.cpp; sourceTree = "<group>"; };
+		4577B24B21F2035C00864FAC /* vulkan_memory_manager.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = vulkan_memory_manager.hpp; path = ../vulkan/vulkan_memory_manager.hpp; sourceTree = "<group>"; };
+		4577B24C21F2035C00864FAC /* vulkan_gpu_buffer_impl.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = vulkan_gpu_buffer_impl.hpp; path = ../vulkan/vulkan_gpu_buffer_impl.hpp; sourceTree = "<group>"; };
+		4577B24D21F2035C00864FAC /* vulkan_layers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = vulkan_layers.cpp; path = ../vulkan/vulkan_layers.cpp; sourceTree = "<group>"; };
+		4577B24E21F2035C00864FAC /* vulkan_base_context.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = vulkan_base_context.hpp; path = ../vulkan/vulkan_base_context.hpp; sourceTree = "<group>"; };
+		4577B24F21F2035D00864FAC /* vulkan_utils.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = vulkan_utils.hpp; path = ../vulkan/vulkan_utils.hpp; sourceTree = "<group>"; };
+		4577B25021F2035D00864FAC /* vulkan_mesh_object_impl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = vulkan_mesh_object_impl.cpp; path = ../vulkan/vulkan_mesh_object_impl.cpp; sourceTree = "<group>"; };
+		4577B25121F2035D00864FAC /* vulkan_base_context.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = vulkan_base_context.cpp; path = ../vulkan/vulkan_base_context.cpp; sourceTree = "<group>"; };
+		4577B25221F2035D00864FAC /* vulkan_memory_manager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = vulkan_memory_manager.cpp; path = ../vulkan/vulkan_memory_manager.cpp; sourceTree = "<group>"; };
+		4577B25321F2035D00864FAC /* vulkan_device_holder.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = vulkan_device_holder.hpp; path = ../vulkan/vulkan_device_holder.hpp; sourceTree = "<group>"; };
 		45789ED52133DFC2009955CC /* metal_base_context.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = metal_base_context.mm; sourceTree = "<group>"; };
 		45789ED92133E14F009955CC /* metal_base_context.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = metal_base_context.hpp; sourceTree = "<group>"; };
 		45789EE9213557F4009955CC /* gl_constants.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = gl_constants.hpp; sourceTree = "<group>"; };
@@ -264,6 +296,29 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		4577B24321F2034200864FAC /* vulkan */ = {
+			isa = PBXGroup;
+			children = (
+				4577B25121F2035D00864FAC /* vulkan_base_context.cpp */,
+				4577B24E21F2035C00864FAC /* vulkan_base_context.hpp */,
+				4577B25321F2035D00864FAC /* vulkan_device_holder.hpp */,
+				4577B24421F2035C00864FAC /* vulkan_gpu_buffer_impl.cpp */,
+				4577B24C21F2035C00864FAC /* vulkan_gpu_buffer_impl.hpp */,
+				4577B24921F2035C00864FAC /* vulkan_gpu_program.hpp */,
+				4577B24D21F2035C00864FAC /* vulkan_layers.cpp */,
+				4577B24821F2035C00864FAC /* vulkan_layers.hpp */,
+				4577B25221F2035D00864FAC /* vulkan_memory_manager.cpp */,
+				4577B24B21F2035C00864FAC /* vulkan_memory_manager.hpp */,
+				4577B25021F2035D00864FAC /* vulkan_mesh_object_impl.cpp */,
+				4577B24A21F2035C00864FAC /* vulkan_texture.cpp */,
+				4577B24521F2035C00864FAC /* vulkan_texture.hpp */,
+				4577B24621F2035C00864FAC /* vulkan_utils.cpp */,
+				4577B24F21F2035D00864FAC /* vulkan_utils.hpp */,
+				4577B24721F2035C00864FAC /* vulkan_vertex_array_buffer_impl.cpp */,
+			);
+			path = vulkan;
+			sourceTree = "<group>";
+		};
 		45789ED42133DF91009955CC /* metal */ = {
 			isa = PBXGroup;
 			children = (
@@ -409,6 +464,7 @@
 				4513BF091EC2F0760066565C /* viewport.cpp */,
 				4513BF0A1EC2F0760066565C /* viewport.hpp */,
 				3492DA0A1CA2D91C00C1F3B3 /* visual_scale.hpp */,
+				4577B24321F2034200864FAC /* vulkan */,
 			);
 			name = drape;
 			path = ../../drape;
@@ -432,6 +488,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4577B25F21F2035D00864FAC /* vulkan_utils.hpp in Headers */,
 				459843902139967F00F8CAB2 /* metal_texture.hpp in Headers */,
 				6729A5A31A69213A007D5872 /* stipple_pen_resource.hpp in Headers */,
 				6729A5661A69213A007D5872 /* attribute_provider.hpp in Headers */,
@@ -444,6 +501,7 @@
 				3492DA0B1CA2D91C00C1F3B3 /* visual_scale.hpp in Headers */,
 				6729A5971A69213A007D5872 /* overlay_tree.hpp in Headers */,
 				6729A5751A69213A007D5872 /* drape_global.hpp in Headers */,
+				4577B25C21F2035D00864FAC /* vulkan_gpu_buffer_impl.hpp in Headers */,
 				4560F59E213F986E00CC736C /* metal_states.hpp in Headers */,
 				6729A5701A69213A007D5872 /* color.hpp in Headers */,
 				6729A5801A69213A007D5872 /* glsl_func.hpp in Headers */,
@@ -475,19 +533,23 @@
 				6729A5AD1A69213A007D5872 /* uniform_value.hpp in Headers */,
 				6729A5951A69213A007D5872 /* overlay_handle.hpp in Headers */,
 				45201E951CE605B1008A4842 /* constants.hpp in Headers */,
+				4577B25E21F2035D00864FAC /* vulkan_base_context.hpp in Headers */,
 				6709472E1BDF9A4F005014C0 /* index_storage.hpp in Headers */,
 				6729A5B51A69213A007D5872 /* vertex_array_buffer.hpp in Headers */,
 				6729A5A71A69213A007D5872 /* texture_manager.hpp in Headers */,
 				34C624CA1DABDB2000510300 /* static_texture.hpp in Headers */,
+				4577B25521F2035D00864FAC /* vulkan_texture.hpp in Headers */,
 				6729A5901A69213A007D5872 /* object_pool.hpp in Headers */,
 				670947261BDF9A4F005014C0 /* bidi.hpp in Headers */,
 				457B536820358F7E00E4E752 /* glyph_generator.hpp in Headers */,
 				6729A5A11A69213A007D5872 /* shader.hpp in Headers */,
 				4513BF0C1EC2F0760066565C /* framebuffer.hpp in Headers */,
 				6729A5641A69213A007D5872 /* attribute_buffer_mutator.hpp in Headers */,
+				4577B25921F2035D00864FAC /* vulkan_gpu_program.hpp in Headers */,
 				6729A5811A69213A007D5872 /* glsl_types.hpp in Headers */,
 				6709472C1BDF9A4F005014C0 /* hw_texture.hpp in Headers */,
 				6729A5911A69213A007D5872 /* oglcontext.hpp in Headers */,
+				4577B25B21F2035D00864FAC /* vulkan_memory_manager.hpp in Headers */,
 				457B536620358F7E00E4E752 /* drape_routine.hpp in Headers */,
 				45789EF2213557F7009955CC /* gl_constants.hpp in Headers */,
 				6729A5AB1A69213A007D5872 /* texture.hpp in Headers */,
@@ -497,7 +559,9 @@
 				BB035F6C1E3A2A5C00519962 /* drape_diagnostics.hpp in Headers */,
 				45789EF7213557F7009955CC /* gl_gpu_program.hpp in Headers */,
 				6729A56E1A69213A007D5872 /* buffer_base.hpp in Headers */,
+				4577B26321F2035D00864FAC /* vulkan_device_holder.hpp in Headers */,
 				6729A58F1A69213A007D5872 /* index_buffer.hpp in Headers */,
+				4577B25821F2035D00864FAC /* vulkan_layers.hpp in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -567,8 +631,11 @@
 				6729A5941A69213A007D5872 /* overlay_handle.cpp in Sources */,
 				6709472D1BDF9A4F005014C0 /* index_storage.cpp in Sources */,
 				6729A5861A69213A007D5872 /* gpu_buffer.cpp in Sources */,
+				4577B25721F2035D00864FAC /* vulkan_vertex_array_buffer_impl.cpp in Sources */,
 				45789EF8213557F7009955CC /* gl_constants.cpp in Sources */,
+				4577B25621F2035D00864FAC /* vulkan_utils.cpp in Sources */,
 				6729A59A1A69213A007D5872 /* render_bucket.cpp in Sources */,
+				4577B25A21F2035D00864FAC /* vulkan_texture.cpp in Sources */,
 				4560F59F213F986E00CC736C /* metal_states.mm in Sources */,
 				4560F5A52142890600CC736C /* metal_gpu_buffer_impl.mm in Sources */,
 				6709472A1BDF9A4F005014C0 /* hw_texture_ios.mm in Sources */,
@@ -586,6 +653,7 @@
 				6729A5A21A69213A007D5872 /* stipple_pen_resource.cpp in Sources */,
 				6729A5691A69213A007D5872 /* batcher.cpp in Sources */,
 				670947251BDF9A4F005014C0 /* bidi.cpp in Sources */,
+				4577B25D21F2035D00864FAC /* vulkan_layers.cpp in Sources */,
 				6729A58C1A69213A007D5872 /* index_buffer_mutator.cpp in Sources */,
 				4598438F2139967F00F8CAB2 /* metal_texture.mm in Sources */,
 				BBB72E902110AF0F00249D4F /* oglcontext.cpp in Sources */,
@@ -595,19 +663,23 @@
 				6709472B1BDF9A4F005014C0 /* hw_texture.cpp in Sources */,
 				6729A5AA1A69213A007D5872 /* texture.cpp in Sources */,
 				BBB72E9C2111CE9100249D4F /* graphics_context_factory.cpp in Sources */,
+				4577B26221F2035D00864FAC /* vulkan_memory_manager.cpp in Sources */,
 				6729A5771A69213A007D5872 /* font_texture.cpp in Sources */,
 				4560F591213EC93400CC736C /* render_state_metal.mm in Sources */,
 				45D7ADE32113535600160DE3 /* render_state.cpp in Sources */,
 				6729A58E1A69213A007D5872 /* index_buffer.cpp in Sources */,
 				6729A5A61A69213A007D5872 /* texture_manager.cpp in Sources */,
+				4577B26121F2035D00864FAC /* vulkan_base_context.cpp in Sources */,
 				670947271BDF9A4F005014C0 /* glyph_manager.cpp in Sources */,
 				6729A56F1A69213A007D5872 /* color.cpp in Sources */,
+				4577B25421F2035D00864FAC /* vulkan_gpu_buffer_impl.cpp in Sources */,
 				6729A5671A69213A007D5872 /* batcher_helpers.cpp in Sources */,
 				6729A5B41A69213A007D5872 /* vertex_array_buffer.cpp in Sources */,
 				6729A5B21A69213A007D5872 /* vertex_decl.cpp in Sources */,
 				6729A5A81A69213A007D5872 /* texture_of_colors.cpp in Sources */,
 				6729A5AC1A69213A007D5872 /* uniform_value.cpp in Sources */,
 				6729A5961A69213A007D5872 /* overlay_tree.cpp in Sources */,
+				4577B26021F2035D00864FAC /* vulkan_mesh_object_impl.cpp in Sources */,
 				6729A5651A69213A007D5872 /* attribute_provider.cpp in Sources */,
 				4560F5A7214297D800CC736C /* metal_vertex_array_buffer_impl.mm in Sources */,
 			);
@@ -634,6 +706,8 @@
 					"$(OMIM_ROOT)/3party/expat/lib",
 					"$(OMIM_ROOT)/3party/icu/common",
 					"$(OMIM_ROOT)/3party/icu/i18n",
+					"$(OMIM_ROOT)/3party/Vulkan-Headers/include",
+					"$(OMIM_ROOT)/3party/vulkan_wrapper",
 				);
 			};
 			name = Debug;
@@ -653,6 +727,8 @@
 					"$(OMIM_ROOT)/3party/expat/lib",
 					"$(OMIM_ROOT)/3party/icu/common",
 					"$(OMIM_ROOT)/3party/icu/i18n",
+					"$(OMIM_ROOT)/3party/Vulkan-Headers/include",
+					"$(OMIM_ROOT)/3party/vulkan_wrapper",
 				);
 			};
 			name = Release;
@@ -734,6 +810,8 @@
 					"$(OMIM_ROOT)/3party/expat/lib",
 					"$(OMIM_ROOT)/3party/icu/common",
 					"$(OMIM_ROOT)/3party/icu/i18n",
+					"$(OMIM_ROOT)/3party/Vulkan-Headers/include",
+					"$(OMIM_ROOT)/3party/vulkan_wrapper",
 				);
 			};
 			name = "Production Full";
diff --git a/xcode/omim.xcworkspace/contents.xcworkspacedata b/xcode/omim.xcworkspace/contents.xcworkspacedata
index 83993b7d3e..8bba8e809b 100644
--- a/xcode/omim.xcworkspace/contents.xcworkspacedata
+++ b/xcode/omim.xcworkspace/contents.xcworkspacedata
@@ -187,9 +187,6 @@
       location = "container:"
       name = "3party">
       <FileRef
-         location = "container:open_location_code/open_location_code.xcodeproj">
-      </FileRef>
-      <FileRef
          location = "container:agg/agg.xcodeproj">
       </FileRef>
       <FileRef
@@ -220,6 +217,9 @@
          location = "container:oauthcpp/oauthcpp.xcodeproj">
       </FileRef>
       <FileRef
+         location = "container:open_location_code/open_location_code.xcodeproj">
+      </FileRef>
+      <FileRef
          location = "container:opening_hours/opening_hours.xcodeproj">
       </FileRef>
       <FileRef
@@ -243,6 +243,9 @@
       <FileRef
          location = "container:tess2/tess2.xcodeproj">
       </FileRef>
+      <FileRef
+         location = "group:vulkan_wrapper/vulkan_wrapper.xcodeproj">
+      </FileRef>
    </Group>
    <FileRef
       location = "container:api/api.xcodeproj">
diff --git a/xcode/shaders/shaders.xcodeproj/project.pbxproj b/xcode/shaders/shaders.xcodeproj/project.pbxproj
index 9b576d5f5f..285d97d4f8 100644
--- a/xcode/shaders/shaders.xcodeproj/project.pbxproj
+++ b/xcode/shaders/shaders.xcodeproj/project.pbxproj
@@ -35,6 +35,8 @@
 		4566610520E25EF70085E8C1 /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4566610420E25EF70085E8C1 /* libplatform.a */; };
 		4566610720E25F560085E8C1 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 4566610620E25F560085E8C1 /* libz.tbd */; };
 		4566610A20E25F790085E8C1 /* test_main_loop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4566610920E25F790085E8C1 /* test_main_loop.cpp */; };
+		4577B28621F2088800864FAC /* vulkan_program_pool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4577B28221F2088800864FAC /* vulkan_program_pool.cpp */; };
+		4577B28721F2088800864FAC /* vulkan_program_params.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4577B28321F2088800864FAC /* vulkan_program_params.cpp */; };
 		45789EE021343F70009955CC /* metal_program_pool.mm in Sources */ = {isa = PBXBuildFile; fileRef = 45789EDE21343F70009955CC /* metal_program_pool.mm */; };
 		45789EE421353CA3009955CC /* program_manager_metal.mm in Sources */ = {isa = PBXBuildFile; fileRef = 45789EE321353CA3009955CC /* program_manager_metal.mm */; };
 		45789EE72135464D009955CC /* metal_program_params.mm in Sources */ = {isa = PBXBuildFile; fileRef = 45789EE62135464D009955CC /* metal_program_params.mm */; };
@@ -177,6 +179,10 @@
 		4566610620E25F560085E8C1 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
 		4566610820E25F790085E8C1 /* test_main_loop.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = test_main_loop.hpp; path = ../../qt_tstfrm/test_main_loop.hpp; sourceTree = "<group>"; };
 		4566610920E25F790085E8C1 /* test_main_loop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = test_main_loop.cpp; path = ../../qt_tstfrm/test_main_loop.cpp; sourceTree = "<group>"; };
+		4577B28221F2088800864FAC /* vulkan_program_pool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vulkan_program_pool.cpp; sourceTree = "<group>"; };
+		4577B28321F2088800864FAC /* vulkan_program_params.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vulkan_program_params.cpp; sourceTree = "<group>"; };
+		4577B28421F2088800864FAC /* vulkan_program_params.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = vulkan_program_params.hpp; sourceTree = "<group>"; };
+		4577B28521F2088800864FAC /* vulkan_program_pool.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = vulkan_program_pool.hpp; sourceTree = "<group>"; };
 		45789EDC21342BDE009955CC /* debug_rect.metal */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.metal; path = debug_rect.metal; sourceTree = "<group>"; };
 		45789EDE21343F70009955CC /* metal_program_pool.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = metal_program_pool.mm; sourceTree = "<group>"; };
 		45789EDF21343F70009955CC /* metal_program_pool.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = metal_program_pool.hpp; sourceTree = "<group>"; };
@@ -270,6 +276,10 @@
 				4566608920E256240085E8C1 /* program_params.hpp */,
 				4566608120E256230085E8C1 /* program_pool.hpp */,
 				4566608620E256230085E8C1 /* programs.hpp */,
+				4577B28321F2088800864FAC /* vulkan_program_params.cpp */,
+				4577B28421F2088800864FAC /* vulkan_program_params.hpp */,
+				4577B28221F2088800864FAC /* vulkan_program_pool.cpp */,
+				4577B28521F2088800864FAC /* vulkan_program_pool.hpp */,
 			);
 			name = shaders;
 			path = ../../shaders;
@@ -557,11 +567,13 @@
 				45789EE72135464D009955CC /* metal_program_params.mm in Sources */,
 				4566608A20E256240085E8C1 /* program_params.cpp in Sources */,
 				45789EE021343F70009955CC /* metal_program_pool.mm in Sources */,
+				4577B28621F2088800864FAC /* vulkan_program_pool.cpp in Sources */,
 				4566608B20E256240085E8C1 /* gl_shaders.cpp in Sources */,
 				45789EE421353CA3009955CC /* program_manager_metal.mm in Sources */,
 				4561ADF520E378CB0096BC12 /* program_manager.cpp in Sources */,
 				4566608C20E256240085E8C1 /* gl_program_params.cpp in Sources */,
 				4566608D20E256240085E8C1 /* gl_program_pool.cpp in Sources */,
+				4577B28721F2088800864FAC /* vulkan_program_params.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -616,6 +628,9 @@
 					"$(OMIM_ROOT)",
 					"$(BOOST_ROOT)",
 					"$(OMIM_ROOT)/3party/glm",
+					"$(OMIM_ROOT)/3party/Vulkan-Headers/include",
+					"$(OMIM_ROOT)/3party/vulkan_wrapper",
+					"$(OMIM_ROOT)/3party/jansson/src",
 				);
 			};
 			name = Debug;
@@ -629,6 +644,9 @@
 					"$(OMIM_ROOT)",
 					"$(BOOST_ROOT)",
 					"$(OMIM_ROOT)/3party/glm",
+					"$(OMIM_ROOT)/3party/Vulkan-Headers/include",
+					"$(OMIM_ROOT)/3party/vulkan_wrapper",
+					"$(OMIM_ROOT)/3party/jansson/src",
 				);
 			};
 			name = Release;
@@ -675,6 +693,9 @@
 					"$(OMIM_ROOT)",
 					"$(BOOST_ROOT)",
 					"$(OMIM_ROOT)/3party/glm",
+					"$(OMIM_ROOT)/3party/Vulkan-Headers/include",
+					"$(OMIM_ROOT)/3party/vulkan_wrapper",
+					"$(OMIM_ROOT)/3party/jansson/src",
 				);
 			};
 			name = "Production Full";
diff --git a/xcode/vulkan_wrapper/vulkan_wrapper.xcodeproj/project.pbxproj b/xcode/vulkan_wrapper/vulkan_wrapper.xcodeproj/project.pbxproj
new file mode 100644
index 0000000000..5026ab9ea0
--- /dev/null
+++ b/xcode/vulkan_wrapper/vulkan_wrapper.xcodeproj/project.pbxproj
@@ -0,0 +1,218 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 50;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		4577B27F21F205D800864FAC /* vulkan_wrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4577B27E21F205D800864FAC /* vulkan_wrapper.cpp */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		4577B26B21F2044300864FAC /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "include/$(PRODUCT_NAME)";
+			dstSubfolderSpec = 16;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		4577B26D21F2044300864FAC /* libvulkan_wrapper.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libvulkan_wrapper.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		4577B27921F2053900864FAC /* common-debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = "<group>"; };
+		4577B27A21F2053900864FAC /* common-release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = "<group>"; };
+		4577B27D21F205D800864FAC /* vulkan_wrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vulkan_wrapper.h; sourceTree = "<group>"; };
+		4577B27E21F205D800864FAC /* vulkan_wrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vulkan_wrapper.cpp; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		4577B26A21F2044300864FAC /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		4577B26421F2044300864FAC = {
+			isa = PBXGroup;
+			children = (
+				4577B27921F2053900864FAC /* common-debug.xcconfig */,
+				4577B27A21F2053900864FAC /* common-release.xcconfig */,
+				4577B26F21F2044300864FAC /* vulkan_wrapper */,
+				4577B26E21F2044300864FAC /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		4577B26E21F2044300864FAC /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				4577B26D21F2044300864FAC /* libvulkan_wrapper.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		4577B26F21F2044300864FAC /* vulkan_wrapper */ = {
+			isa = PBXGroup;
+			children = (
+				4577B27E21F205D800864FAC /* vulkan_wrapper.cpp */,
+				4577B27D21F205D800864FAC /* vulkan_wrapper.h */,
+			);
+			name = vulkan_wrapper;
+			path = ../../3party/vulkan_wrapper;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		4577B26C21F2044300864FAC /* vulkan_wrapper */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 4577B27621F2044300864FAC /* Build configuration list for PBXNativeTarget "vulkan_wrapper" */;
+			buildPhases = (
+				4577B26921F2044300864FAC /* Sources */,
+				4577B26A21F2044300864FAC /* Frameworks */,
+				4577B26B21F2044300864FAC /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = vulkan_wrapper;
+			productName = vulkan_wrapper;
+			productReference = 4577B26D21F2044300864FAC /* libvulkan_wrapper.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		4577B26521F2044300864FAC /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 1010;
+				ORGANIZATIONNAME = maps.me;
+				TargetAttributes = {
+					4577B26C21F2044300864FAC = {
+						CreatedOnToolsVersion = 10.1;
+					};
+				};
+			};
+			buildConfigurationList = 4577B26821F2044300864FAC /* Build configuration list for PBXProject "vulkan_wrapper" */;
+			compatibilityVersion = "Xcode 9.3";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 4577B26421F2044300864FAC;
+			productRefGroup = 4577B26E21F2044300864FAC /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				4577B26C21F2044300864FAC /* vulkan_wrapper */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		4577B26921F2044300864FAC /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4577B27F21F205D800864FAC /* vulkan_wrapper.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		4577B27421F2044300864FAC /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		4577B27521F2044300864FAC /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		4577B27721F2044300864FAC /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 4577B27921F2053900864FAC /* common-debug.xcconfig */;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(OMIM_ROOT)",
+					"$(BOOST_ROOT)",
+					"$(OMIM_ROOT)/3party/Vulkan-Headers/include",
+				);
+			};
+			name = Debug;
+		};
+		4577B27821F2044300864FAC /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 4577B27A21F2053900864FAC /* common-release.xcconfig */;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(OMIM_ROOT)",
+					"$(BOOST_ROOT)",
+					"$(OMIM_ROOT)/3party/Vulkan-Headers/include",
+				);
+			};
+			name = Release;
+		};
+		4577B27B21F2057700864FAC /* Production Full */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+			};
+			name = "Production Full";
+		};
+		4577B27C21F2057700864FAC /* Production Full */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 4577B27A21F2053900864FAC /* common-release.xcconfig */;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(OMIM_ROOT)",
+					"$(BOOST_ROOT)",
+					"$(OMIM_ROOT)/3party/Vulkan-Headers/include",
+				);
+			};
+			name = "Production Full";
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		4577B26821F2044300864FAC /* Build configuration list for PBXProject "vulkan_wrapper" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4577B27421F2044300864FAC /* Debug */,
+				4577B27521F2044300864FAC /* Release */,
+				4577B27B21F2057700864FAC /* Production Full */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		4577B27621F2044300864FAC /* Build configuration list for PBXNativeTarget "vulkan_wrapper" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4577B27721F2044300864FAC /* Debug */,
+				4577B27821F2044300864FAC /* Release */,
+				4577B27C21F2057700864FAC /* Production Full */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 4577B26521F2044300864FAC /* Project object */;
+}
diff --git a/xcode/vulkan_wrapper/vulkan_wrapper.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/xcode/vulkan_wrapper/vulkan_wrapper.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000000..a1887c94e4
--- /dev/null
+++ b/xcode/vulkan_wrapper/vulkan_wrapper.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:vulkan_wrapper.xcodeproj">
+   </FileRef>
+</Workspace>