From 1148e48085a316928a67883d05e7eb8a093b0a10 Mon Sep 17 00:00:00 2001 From: Attila Uygun Date: Mon, 26 Jun 2023 15:14:59 +0200 Subject: [PATCH] Fix typo --- src/engine/renderer/vulkan/renderer_vulkan.cc | 12 ++++++------ src/engine/renderer/vulkan/renderer_vulkan.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/engine/renderer/vulkan/renderer_vulkan.cc b/src/engine/renderer/vulkan/renderer_vulkan.cc index 8e293e1..6c88ff2 100644 --- a/src/engine/renderer/vulkan/renderer_vulkan.cc +++ b/src/engine/renderer/vulkan/renderer_vulkan.cc @@ -522,8 +522,8 @@ void RendererVulkan::ActivateTexture(uint64_t resource_id) { if (it == textures_.end()) return; - // Keep as pengind and bind later in ActivateShader. - penging_descriptor_sets_[/*TODO*/ 0] = std::get<0>(it->second.desc_set); + // Keep as pending and bind later in ActivateShader. + pending_descriptor_sets_[/*TODO*/ 0] = std::get<0>(it->second.desc_set); } uint64_t RendererVulkan::CreateShader( @@ -737,8 +737,8 @@ void RendererVulkan::ActivateShader(uint64_t resource_id) { VK_PIPELINE_BIND_POINT_GRAPHICS, it->second.pipeline); } for (size_t i = 0; i < it->second.desc_set_count; ++i) { - if (active_descriptor_sets_[i] != penging_descriptor_sets_[i]) { - active_descriptor_sets_[i] = penging_descriptor_sets_[i]; + if (active_descriptor_sets_[i] != pending_descriptor_sets_[i]) { + active_descriptor_sets_[i] = pending_descriptor_sets_[i]; vkCmdBindDescriptorSets(frames_[current_frame_].draw_command_buffer, VK_PIPELINE_BIND_POINT_GRAPHICS, it->second.pipeline_layout, 0, 1, @@ -1770,7 +1770,7 @@ bool RendererVulkan::CreatePipelineLayout( if (active_descriptor_sets_.size() < shader.desc_set_count) { active_descriptor_sets_.resize(shader.desc_set_count); - penging_descriptor_sets_.resize(shader.desc_set_count); + pending_descriptor_sets_.resize(shader.desc_set_count); } // Parse push constants. @@ -1977,7 +1977,7 @@ void RendererVulkan::SwapBuffers() { active_pipeline_ = VK_NULL_HANDLE; for (auto& ds : active_descriptor_sets_) ds = VK_NULL_HANDLE; - for (auto& ds : penging_descriptor_sets_) + for (auto& ds : pending_descriptor_sets_) ds = VK_NULL_HANDLE; BeginFrame(); diff --git a/src/engine/renderer/vulkan/renderer_vulkan.h b/src/engine/renderer/vulkan/renderer_vulkan.h index eb44e90..544f6b0 100644 --- a/src/engine/renderer/vulkan/renderer_vulkan.h +++ b/src/engine/renderer/vulkan/renderer_vulkan.h @@ -169,7 +169,7 @@ class RendererVulkan final : public Renderer { std::vector> desc_pools_; VkDescriptorSetLayout descriptor_set_layout_ = VK_NULL_HANDLE; std::vector active_descriptor_sets_; - std::vector penging_descriptor_sets_; + std::vector pending_descriptor_sets_; VkSampler sampler_ = VK_NULL_HANDLE;