diff options
Diffstat (limited to 'src/vk/model.cpp')
| -rw-r--r-- | src/vk/model.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/vk/model.cpp b/src/vk/model.cpp index 5cf96b6..240ad13 100644 --- a/src/vk/model.cpp +++ b/src/vk/model.cpp @@ -21,7 +21,7 @@ #include "../command.hpp" #include "../core.hpp" -#include "vertex.hpp" +#include "vertex_3d.hpp" namespace { @@ -82,12 +82,11 @@ load_mesh(void *obj) self->model->queue_family = cg_core.vk_device_with_swapchain->get_queue_family_with_graphics(); - VK::Queue transfer_queue{self->model->queue_family->get_queue()}; // Load vertexes. { auto vertex_count{read_uint32_from_file(input_file)}; - std::vector<VK::Vertex> vertexes{vertex_count}; + std::vector<VK::Vertex3D> vertexes{vertex_count}; for(auto i{0}; i < vertex_count; i++) { @@ -133,7 +132,7 @@ unload_mesh(void *obj) delete self->model->source_vertex_buffer; } -auto +void load_uniform_buffers(void *obj) { auto self = static_cast<ModelBuilder*>(obj); @@ -196,7 +195,7 @@ load_descriptor_sets(void *obj) std::vector<VkDescriptorSetLayout> layouts( cg_core.vk_swapchain->images_count, - cg_core.vk_graphics_pipeline->descriptor_set_layout_model_instance); + cg_core.vk_graphics_pipeline_3d->descriptor_set_layout_model_instance); VkDescriptorSetAllocateInfo alloc_info{}; alloc_info.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; |