mirror of
				https://github.com/MadeOfJelly/MushMachine.git
				synced 2025-10-30 22:16:52 +01:00 
			
		
		
		
	working on some hacky randering
This commit is contained in:
		| @@ -14,8 +14,20 @@ | ||||
|  | ||||
| #include <SDL_vulkan.h> | ||||
|  | ||||
| // HACK | ||||
| namespace { // dont leak linkage | ||||
| #include <mm/vulkan/res/tut1.vert.spv.h> | ||||
| #include <mm/vulkan/res/tut1.frag.spv.h> | ||||
|  | ||||
| // meh, we dont have the type, only the value | ||||
| //static_assert(alignof(tut1_vert_spv) == alignof(uint32_t)); | ||||
| //static_assert(alignof(tut1_frag_spv) == alignof(uint32_t)); | ||||
| } | ||||
|  | ||||
| #include <mm/logger.hpp> | ||||
|  | ||||
| // https://youtu.be/eaKeeRngZBo | ||||
|  | ||||
| // this needs to be defined only once | ||||
| VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE | ||||
|  | ||||
| @@ -219,8 +231,17 @@ void VulkanRenderer::disable(Engine&) { | ||||
| 			} | ||||
| 		}; | ||||
|  | ||||
| 		auto device_destroy_each_kv = [&device](auto& map) { | ||||
| 			for (const auto& it : map) { | ||||
| 				device.destroy(it.second); | ||||
| 			} | ||||
| 		}; | ||||
|  | ||||
| 		device.waitIdle(); | ||||
|  | ||||
| 		// resouce cache | ||||
| 		device_destroy_each_kv(_r_shader_module); | ||||
|  | ||||
| 		device_destroy_each(_swapchain_framebuffers); | ||||
| 		device_destroy_each(_swapchain_image_views); | ||||
| 		device.destroy(_swapchain); | ||||
| @@ -459,6 +480,57 @@ bool VulkanRenderer::createSwapchain(Engine& engine) { | ||||
|  | ||||
| 	// TODO: move | ||||
|  | ||||
| 	// TODO: refactor, provide "primitive" wrapper like opengl | ||||
| 	auto create_shader_module = [&](const uint8_t* data, const size_t size) -> vk::ShaderModule { | ||||
| 		return device.createShaderModule(vk::ShaderModuleCreateInfo{ | ||||
| 			{}, | ||||
| 			size, | ||||
| 			reinterpret_cast<const uint32_t*>(data) | ||||
| 		}); | ||||
| 	}; | ||||
|  | ||||
| 	using namespace entt::literals; | ||||
|  | ||||
| 	auto vert_module = create_shader_module(tut1_vert_spv, tut1_vert_spv_len); | ||||
| 	_r_shader_module["tut1_vert"_hs] = vert_module; | ||||
| 	auto frag_module = create_shader_module(tut1_frag_spv, tut1_frag_spv_len); | ||||
| 	_r_shader_module["tut1_frag"_hs] = frag_module; | ||||
|  | ||||
| 	std::vector<vk::PipelineShaderStageCreateInfo> pl_shader_ci { | ||||
| 		{ | ||||
| 			{}, | ||||
| 			vk::ShaderStageFlagBits::eVertex, | ||||
| 			vert_module, | ||||
| 			"main", | ||||
| 		}, | ||||
| 		{ | ||||
| 			{}, | ||||
| 			vk::ShaderStageFlagBits::eFragment, | ||||
| 			frag_module, | ||||
| 			"main", | ||||
| 		} | ||||
| 	}; | ||||
|  | ||||
| 	std::vector<vk::PipelineVertexInputStateCreateInfo> pl_vertex_input_ci { | ||||
| 		// hardcoded in shader, so no actual data here | ||||
| 		{}, | ||||
| 		{}, // do i need two? | ||||
| 	}; | ||||
|  | ||||
| 	vk::PipelineInputAssemblyStateCreateInfo pl_input_asm_ci { | ||||
| 		{}, | ||||
| 		vk::PrimitiveTopology::eTriangleList, | ||||
| 		VK_FALSE | ||||
| 	}; | ||||
|  | ||||
| 	device.createGraphicsPipeline({}, { | ||||
| 		{}, | ||||
| 		static_cast<uint32_t>(pl_shader_ci.size()), | ||||
| 		pl_shader_ci.data(), | ||||
| 		pl_vertex_input_ci.data(), | ||||
| 		&pl_input_asm_ci, | ||||
| 	}); | ||||
|  | ||||
| 	_swapchain_framebuffers.clear(); | ||||
| 	for (const auto& img_view : _swapchain_image_views) { | ||||
| 		vk::ImageView tmp_img_view = img_view; | ||||
|   | ||||
| @@ -1,7 +1,9 @@ | ||||
| #pragma once | ||||
|  | ||||
| #include "entt/core/hashed_string.hpp" | ||||
| #include <mm/engine_fwd.hpp> | ||||
| #include <mm/services/service.hpp> | ||||
| #include <unordered_map> | ||||
|  | ||||
| // fwd vk stuff | ||||
|  | ||||
| @@ -25,6 +27,7 @@ MM_VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSemaphore) | ||||
| MM_VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkFence) | ||||
| MM_VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkImageView) | ||||
| MM_VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkFramebuffer) | ||||
| MM_VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkShaderModule) | ||||
|  | ||||
| // extensions | ||||
| MM_VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDebugUtilsMessengerEXT) | ||||
| @@ -57,6 +60,9 @@ class VulkanRenderer : public Service { | ||||
| 		std::vector<VkSemaphore> _swapchain_sem_render_finished{}; | ||||
| 		std::vector<VkFence> _swapchain_fence_in_flight{}; | ||||
|  | ||||
| 		// resource cache | ||||
| 		std::unordered_map<entt::hashed_string::hash_type, VkShaderModule> _r_shader_module{}; | ||||
|  | ||||
| 	public: | ||||
| 		VulkanRenderer(void); | ||||
| 		~VulkanRenderer(void); | ||||
| @@ -73,6 +79,14 @@ class VulkanRenderer : public Service { | ||||
| 		bool createDevice(Engine& engine); | ||||
|  | ||||
| 		bool createSwapchain(Engine& engine); | ||||
|  | ||||
| 		//VkShaderModule getR_shader_module(const entt::hashed_string::value_type key) { | ||||
| 			//return _r_shader_module.at(key); | ||||
| 		//} | ||||
|  | ||||
| 		//VkShaderModule getR_shader_module(const char* key) { | ||||
| 			//return getR_shader_module(entt::hashed_string::value(key)); | ||||
| 		//} | ||||
| }; | ||||
|  | ||||
| } // MM::Services | ||||
|   | ||||
							
								
								
									
										10
									
								
								framework/vulkan_renderer/src/mm/vulkan/res/tut1.frag
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								framework/vulkan_renderer/src/mm/vulkan/res/tut1.frag
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,10 @@ | ||||
| #version 450 | ||||
|  | ||||
| layout(location = 0) in vec3 fragColor; | ||||
|  | ||||
| layout(location = 0) out vec4 outColor; | ||||
|  | ||||
| void main() { | ||||
| 	outColor = vec4(fragColor, 1.0); | ||||
| } | ||||
|  | ||||
							
								
								
									
										
											BIN
										
									
								
								framework/vulkan_renderer/src/mm/vulkan/res/tut1.frag.spv
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								framework/vulkan_renderer/src/mm/vulkan/res/tut1.frag.spv
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										45
									
								
								framework/vulkan_renderer/src/mm/vulkan/res/tut1.frag.spv.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										45
									
								
								framework/vulkan_renderer/src/mm/vulkan/res/tut1.frag.spv.h
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,45 @@ | ||||
| alignas(uint32_t) unsigned char tut1_frag_spv[] = { | ||||
|   0x03, 0x02, 0x23, 0x07, 0x00, 0x03, 0x01, 0x00, 0x0a, 0x00, 0x08, 0x00, | ||||
|   0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x02, 0x00, | ||||
|   0x01, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00, | ||||
|   0x47, 0x4c, 0x53, 0x4c, 0x2e, 0x73, 0x74, 0x64, 0x2e, 0x34, 0x35, 0x30, | ||||
|   0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, | ||||
|   0x01, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x07, 0x00, 0x04, 0x00, 0x00, 0x00, | ||||
|   0x04, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x69, 0x6e, 0x00, 0x00, 0x00, 0x00, | ||||
|   0x09, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x10, 0x00, 0x03, 0x00, | ||||
|   0x04, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x03, 0x00, 0x03, 0x00, | ||||
|   0x02, 0x00, 0x00, 0x00, 0xc2, 0x01, 0x00, 0x00, 0x05, 0x00, 0x04, 0x00, | ||||
|   0x04, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x69, 0x6e, 0x00, 0x00, 0x00, 0x00, | ||||
|   0x05, 0x00, 0x05, 0x00, 0x09, 0x00, 0x00, 0x00, 0x6f, 0x75, 0x74, 0x43, | ||||
|   0x6f, 0x6c, 0x6f, 0x72, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x05, 0x00, | ||||
|   0x0c, 0x00, 0x00, 0x00, 0x66, 0x72, 0x61, 0x67, 0x43, 0x6f, 0x6c, 0x6f, | ||||
|   0x72, 0x00, 0x00, 0x00, 0x47, 0x00, 0x04, 0x00, 0x09, 0x00, 0x00, 0x00, | ||||
|   0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x00, 0x04, 0x00, | ||||
|   0x0c, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | ||||
|   0x13, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x21, 0x00, 0x03, 0x00, | ||||
|   0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x16, 0x00, 0x03, 0x00, | ||||
|   0x06, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x17, 0x00, 0x04, 0x00, | ||||
|   0x07, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, | ||||
|   0x20, 0x00, 0x04, 0x00, 0x08, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, | ||||
|   0x07, 0x00, 0x00, 0x00, 0x3b, 0x00, 0x04, 0x00, 0x08, 0x00, 0x00, 0x00, | ||||
|   0x09, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x17, 0x00, 0x04, 0x00, | ||||
|   0x0a, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, | ||||
|   0x20, 0x00, 0x04, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, | ||||
|   0x0a, 0x00, 0x00, 0x00, 0x3b, 0x00, 0x04, 0x00, 0x0b, 0x00, 0x00, 0x00, | ||||
|   0x0c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x2b, 0x00, 0x04, 0x00, | ||||
|   0x06, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, | ||||
|   0x36, 0x00, 0x05, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, | ||||
|   0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x02, 0x00, | ||||
|   0x05, 0x00, 0x00, 0x00, 0x3d, 0x00, 0x04, 0x00, 0x0a, 0x00, 0x00, 0x00, | ||||
|   0x0d, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x51, 0x00, 0x05, 0x00, | ||||
|   0x06, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, | ||||
|   0x00, 0x00, 0x00, 0x00, 0x51, 0x00, 0x05, 0x00, 0x06, 0x00, 0x00, 0x00, | ||||
|   0x10, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, | ||||
|   0x51, 0x00, 0x05, 0x00, 0x06, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, | ||||
|   0x0d, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x50, 0x00, 0x07, 0x00, | ||||
|   0x07, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, | ||||
|   0x10, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, | ||||
|   0x3e, 0x00, 0x03, 0x00, 0x09, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, | ||||
|   0xfd, 0x00, 0x01, 0x00, 0x38, 0x00, 0x01, 0x00 | ||||
| }; | ||||
| unsigned int tut1_frag_spv_len = 500; | ||||
							
								
								
									
										21
									
								
								framework/vulkan_renderer/src/mm/vulkan/res/tut1.vert
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								framework/vulkan_renderer/src/mm/vulkan/res/tut1.vert
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,21 @@ | ||||
| #version 450 | ||||
|  | ||||
| layout(location = 0) out vec3 fragColor; | ||||
|  | ||||
| vec2 positions[3] = vec2[]( | ||||
| 	vec2(0.0, -0.5), | ||||
| 	vec2(0.5, 0.5), | ||||
| 	vec2(-0.5, 0.5) | ||||
| ); | ||||
|  | ||||
| vec3 colors[3] = vec3[]( | ||||
| 	vec3(1.0, 0.0, 0.0), | ||||
| 	vec3(0.0, 1.0, 0.0), | ||||
| 	vec3(0.0, 0.0, 1.0) | ||||
| ); | ||||
|  | ||||
| void main() { | ||||
| 	gl_Position = vec4(positions[gl_VertexIndex], 0.0, 1.0); | ||||
| 	fragColor = colors[gl_VertexIndex]; | ||||
| } | ||||
|  | ||||
							
								
								
									
										
											BIN
										
									
								
								framework/vulkan_renderer/src/mm/vulkan/res/tut1.vert.spv
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								framework/vulkan_renderer/src/mm/vulkan/res/tut1.vert.spv
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										123
									
								
								framework/vulkan_renderer/src/mm/vulkan/res/tut1.vert.spv.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										123
									
								
								framework/vulkan_renderer/src/mm/vulkan/res/tut1.vert.spv.h
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,123 @@ | ||||
| alignas(uint32_t) unsigned char tut1_vert_spv[] = { | ||||
|   0x03, 0x02, 0x23, 0x07, 0x00, 0x03, 0x01, 0x00, 0x0a, 0x00, 0x08, 0x00, | ||||
|   0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x02, 0x00, | ||||
|   0x01, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x06, 0x00, 0x01, 0x00, 0x00, 0x00, | ||||
|   0x47, 0x4c, 0x53, 0x4c, 0x2e, 0x73, 0x74, 0x64, 0x2e, 0x34, 0x35, 0x30, | ||||
|   0x00, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, | ||||
|   0x01, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, | ||||
|   0x04, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x69, 0x6e, 0x00, 0x00, 0x00, 0x00, | ||||
|   0x22, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00, | ||||
|   0x03, 0x00, 0x03, 0x00, 0x02, 0x00, 0x00, 0x00, 0xc2, 0x01, 0x00, 0x00, | ||||
|   0x05, 0x00, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x6d, 0x61, 0x69, 0x6e, | ||||
|   0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x05, 0x00, 0x0c, 0x00, 0x00, 0x00, | ||||
|   0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x00, 0x00, 0x00, | ||||
|   0x05, 0x00, 0x04, 0x00, 0x17, 0x00, 0x00, 0x00, 0x63, 0x6f, 0x6c, 0x6f, | ||||
|   0x72, 0x73, 0x00, 0x00, 0x05, 0x00, 0x06, 0x00, 0x20, 0x00, 0x00, 0x00, | ||||
|   0x67, 0x6c, 0x5f, 0x50, 0x65, 0x72, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, | ||||
|   0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x06, 0x00, 0x20, 0x00, 0x00, 0x00, | ||||
|   0x00, 0x00, 0x00, 0x00, 0x67, 0x6c, 0x5f, 0x50, 0x6f, 0x73, 0x69, 0x74, | ||||
|   0x69, 0x6f, 0x6e, 0x00, 0x06, 0x00, 0x07, 0x00, 0x20, 0x00, 0x00, 0x00, | ||||
|   0x01, 0x00, 0x00, 0x00, 0x67, 0x6c, 0x5f, 0x50, 0x6f, 0x69, 0x6e, 0x74, | ||||
|   0x53, 0x69, 0x7a, 0x65, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x07, 0x00, | ||||
|   0x20, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x67, 0x6c, 0x5f, 0x43, | ||||
|   0x6c, 0x69, 0x70, 0x44, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x00, | ||||
|   0x06, 0x00, 0x07, 0x00, 0x20, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, | ||||
|   0x67, 0x6c, 0x5f, 0x43, 0x75, 0x6c, 0x6c, 0x44, 0x69, 0x73, 0x74, 0x61, | ||||
|   0x6e, 0x63, 0x65, 0x00, 0x05, 0x00, 0x03, 0x00, 0x22, 0x00, 0x00, 0x00, | ||||
|   0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x06, 0x00, 0x26, 0x00, 0x00, 0x00, | ||||
|   0x67, 0x6c, 0x5f, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x49, 0x6e, 0x64, | ||||
|   0x65, 0x78, 0x00, 0x00, 0x05, 0x00, 0x05, 0x00, 0x31, 0x00, 0x00, 0x00, | ||||
|   0x66, 0x72, 0x61, 0x67, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x00, 0x00, 0x00, | ||||
|   0x48, 0x00, 0x05, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | ||||
|   0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x00, 0x05, 0x00, | ||||
|   0x20, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, | ||||
|   0x01, 0x00, 0x00, 0x00, 0x48, 0x00, 0x05, 0x00, 0x20, 0x00, 0x00, 0x00, | ||||
|   0x02, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, | ||||
|   0x48, 0x00, 0x05, 0x00, 0x20, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, | ||||
|   0x0b, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x47, 0x00, 0x03, 0x00, | ||||
|   0x20, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x47, 0x00, 0x04, 0x00, | ||||
|   0x26, 0x00, 0x00, 0x00, 0x0b, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x00, 0x00, | ||||
|   0x47, 0x00, 0x04, 0x00, 0x31, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, | ||||
|   0x00, 0x00, 0x00, 0x00, 0x13, 0x00, 0x02, 0x00, 0x02, 0x00, 0x00, 0x00, | ||||
|   0x21, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, | ||||
|   0x16, 0x00, 0x03, 0x00, 0x06, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, | ||||
|   0x17, 0x00, 0x04, 0x00, 0x07, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, | ||||
|   0x02, 0x00, 0x00, 0x00, 0x15, 0x00, 0x04, 0x00, 0x08, 0x00, 0x00, 0x00, | ||||
|   0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2b, 0x00, 0x04, 0x00, | ||||
|   0x08, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, | ||||
|   0x1c, 0x00, 0x04, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, | ||||
|   0x09, 0x00, 0x00, 0x00, 0x20, 0x00, 0x04, 0x00, 0x0b, 0x00, 0x00, 0x00, | ||||
|   0x06, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x3b, 0x00, 0x04, 0x00, | ||||
|   0x0b, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, | ||||
|   0x2b, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, | ||||
|   0x00, 0x00, 0x00, 0x00, 0x2b, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00, 0x00, | ||||
|   0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbf, 0x2c, 0x00, 0x05, 0x00, | ||||
|   0x07, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, | ||||
|   0x0e, 0x00, 0x00, 0x00, 0x2b, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00, 0x00, | ||||
|   0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x2c, 0x00, 0x05, 0x00, | ||||
|   0x07, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, | ||||
|   0x10, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x05, 0x00, 0x07, 0x00, 0x00, 0x00, | ||||
|   0x12, 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, | ||||
|   0x2c, 0x00, 0x06, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, | ||||
|   0x0f, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, | ||||
|   0x17, 0x00, 0x04, 0x00, 0x14, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, | ||||
|   0x03, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x04, 0x00, 0x15, 0x00, 0x00, 0x00, | ||||
|   0x14, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x20, 0x00, 0x04, 0x00, | ||||
|   0x16, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x15, 0x00, 0x00, 0x00, | ||||
|   0x3b, 0x00, 0x04, 0x00, 0x16, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, | ||||
|   0x06, 0x00, 0x00, 0x00, 0x2b, 0x00, 0x04, 0x00, 0x06, 0x00, 0x00, 0x00, | ||||
|   0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x2c, 0x00, 0x06, 0x00, | ||||
|   0x14, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, | ||||
|   0x0d, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x06, 0x00, | ||||
|   0x14, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, | ||||
|   0x18, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x06, 0x00, | ||||
|   0x14, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, | ||||
|   0x0d, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x06, 0x00, | ||||
|   0x15, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x19, 0x00, 0x00, 0x00, | ||||
|   0x1a, 0x00, 0x00, 0x00, 0x1b, 0x00, 0x00, 0x00, 0x17, 0x00, 0x04, 0x00, | ||||
|   0x1d, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, | ||||
|   0x2b, 0x00, 0x04, 0x00, 0x08, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, | ||||
|   0x01, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x04, 0x00, 0x1f, 0x00, 0x00, 0x00, | ||||
|   0x06, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x1e, 0x00, 0x06, 0x00, | ||||
|   0x20, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, | ||||
|   0x1f, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x20, 0x00, 0x04, 0x00, | ||||
|   0x21, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, | ||||
|   0x3b, 0x00, 0x04, 0x00, 0x21, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, | ||||
|   0x03, 0x00, 0x00, 0x00, 0x15, 0x00, 0x04, 0x00, 0x23, 0x00, 0x00, 0x00, | ||||
|   0x20, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x2b, 0x00, 0x04, 0x00, | ||||
|   0x23, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | ||||
|   0x20, 0x00, 0x04, 0x00, 0x25, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, | ||||
|   0x23, 0x00, 0x00, 0x00, 0x3b, 0x00, 0x04, 0x00, 0x25, 0x00, 0x00, 0x00, | ||||
|   0x26, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x20, 0x00, 0x04, 0x00, | ||||
|   0x28, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, | ||||
|   0x20, 0x00, 0x04, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, | ||||
|   0x1d, 0x00, 0x00, 0x00, 0x20, 0x00, 0x04, 0x00, 0x30, 0x00, 0x00, 0x00, | ||||
|   0x03, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x3b, 0x00, 0x04, 0x00, | ||||
|   0x30, 0x00, 0x00, 0x00, 0x31, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, | ||||
|   0x20, 0x00, 0x04, 0x00, 0x33, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, | ||||
|   0x14, 0x00, 0x00, 0x00, 0x36, 0x00, 0x05, 0x00, 0x02, 0x00, 0x00, 0x00, | ||||
|   0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, | ||||
|   0xf8, 0x00, 0x02, 0x00, 0x05, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x03, 0x00, | ||||
|   0x0c, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x03, 0x00, | ||||
|   0x17, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x3d, 0x00, 0x04, 0x00, | ||||
|   0x23, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, | ||||
|   0x41, 0x00, 0x05, 0x00, 0x28, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00, | ||||
|   0x0c, 0x00, 0x00, 0x00, 0x27, 0x00, 0x00, 0x00, 0x3d, 0x00, 0x04, 0x00, | ||||
|   0x07, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00, | ||||
|   0x51, 0x00, 0x05, 0x00, 0x06, 0x00, 0x00, 0x00, 0x2b, 0x00, 0x00, 0x00, | ||||
|   0x2a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x51, 0x00, 0x05, 0x00, | ||||
|   0x06, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x00, 0x00, | ||||
|   0x01, 0x00, 0x00, 0x00, 0x50, 0x00, 0x07, 0x00, 0x1d, 0x00, 0x00, 0x00, | ||||
|   0x2d, 0x00, 0x00, 0x00, 0x2b, 0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00, | ||||
|   0x0d, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x41, 0x00, 0x05, 0x00, | ||||
|   0x2e, 0x00, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x00, 0x22, 0x00, 0x00, 0x00, | ||||
|   0x24, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x03, 0x00, 0x2f, 0x00, 0x00, 0x00, | ||||
|   0x2d, 0x00, 0x00, 0x00, 0x3d, 0x00, 0x04, 0x00, 0x23, 0x00, 0x00, 0x00, | ||||
|   0x32, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, 0x41, 0x00, 0x05, 0x00, | ||||
|   0x33, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, | ||||
|   0x32, 0x00, 0x00, 0x00, 0x3d, 0x00, 0x04, 0x00, 0x14, 0x00, 0x00, 0x00, | ||||
|   0x35, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x03, 0x00, | ||||
|   0x31, 0x00, 0x00, 0x00, 0x35, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x01, 0x00, | ||||
|   0x38, 0x00, 0x01, 0x00 | ||||
| }; | ||||
| unsigned int tut1_vert_spv_len = 1432; | ||||
| @@ -27,7 +27,7 @@ TEST(sdl_service, window_vulkan) { | ||||
| 	ASSERT_TRUE(vk_rend.createDevice(engine)); | ||||
| 	ASSERT_TRUE(vk_rend.createSwapchain(engine)); | ||||
|  | ||||
| 	engine.run(); | ||||
| 	//engine.run(); | ||||
|  | ||||
| 	engine.disableService<MM::Services::VulkanRenderer>(); | ||||
| 	engine.disableService<MM::Services::SDLService>(); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user