diff options
author | Frederico Linhares <fred@linhares.blue> | 2023-10-30 15:06:56 -0300 |
---|---|---|
committer | Frederico Linhares <fred@linhares.blue> | 2023-10-30 15:06:56 -0300 |
commit | 85337fb5aa1ce63023ddd5e284ae6b2ccdbb5e30 (patch) | |
tree | 16e2538b1039067c9732645f301ae717a8855a49 /src/vk/graphics_pipeline_3d.cpp | |
parent | c4efa865f359c5c9e365d5faa8ae3c88f3657cb7 (diff) |
refa Move texture sampler to texture object
Diffstat (limited to 'src/vk/graphics_pipeline_3d.cpp')
-rw-r--r-- | src/vk/graphics_pipeline_3d.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/vk/graphics_pipeline_3d.cpp b/src/vk/graphics_pipeline_3d.cpp index 6bfd559..f657a54 100644 --- a/src/vk/graphics_pipeline_3d.cpp +++ b/src/vk/graphics_pipeline_3d.cpp @@ -305,10 +305,11 @@ GraphicsPipeline3D::draw( base_matrix = glm::rotate( base_matrix, instance->rotation->z, glm::vec3{0.0, 0.0, 1.0}); - std::array<VkDescriptorSet, 3> vk_descriptor_sets{ + std::array<VkDescriptorSet, 4> vk_descriptor_sets{ cg_core.vk_light->descriptor_sets_world[image_index], view->descriptor_sets_3d[image_index], - instance->descriptor_sets[image_index]}; + instance->descriptor_sets[image_index], + instance->texture->descriptor_sets[image_index]}; vkCmdBindDescriptorSets( draw_command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, |