ashikk
/
kaliber
mirror of https://github.com/auygun/kaliber.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix typo

This commit is contained in:
Attila Uygun 2023-06-26 15:14:59 +02:00
parent ce440f2913
commit 1148e48085
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/engine/renderer/vulkan/renderer_vulkan.cc
View File

@ -522,8 +522,8 @@ void RendererVulkan::ActivateTexture(uint64_t resource_id) {
if (it == textures_.end()) if (it == textures_.end())
return; return;
// Keep as pengind and bind later in ActivateShader. // Keep as pending and bind later in ActivateShader.
penging_descriptor_sets_[/*TODO*/ 0] = std::get<0>(it->second.desc_set); pending_descriptor_sets_[/*TODO*/ 0] = std::get<0>(it->second.desc_set);
} }
uint64_t RendererVulkan::CreateShader( uint64_t RendererVulkan::CreateShader(
@ -737,8 +737,8 @@ void RendererVulkan::ActivateShader(uint64_t resource_id) {
VK_PIPELINE_BIND_POINT_GRAPHICS, it->second.pipeline); VK_PIPELINE_BIND_POINT_GRAPHICS, it->second.pipeline);
} }
for (size_t i = 0; i < it->second.desc_set_count; ++i) { for (size_t i = 0; i < it->second.desc_set_count; ++i) {
if (active_descriptor_sets_[i] != penging_descriptor_sets_[i]) { if (active_descriptor_sets_[i] != pending_descriptor_sets_[i]) {
active_descriptor_sets_[i] = penging_descriptor_sets_[i]; active_descriptor_sets_[i] = pending_descriptor_sets_[i];
vkCmdBindDescriptorSets(frames_[current_frame_].draw_command_buffer, vkCmdBindDescriptorSets(frames_[current_frame_].draw_command_buffer,
VK_PIPELINE_BIND_POINT_GRAPHICS, VK_PIPELINE_BIND_POINT_GRAPHICS,
it->second.pipeline_layout, 0, 1, it->second.pipeline_layout, 0, 1,
@ -1770,7 +1770,7 @@ bool RendererVulkan::CreatePipelineLayout(
if (active_descriptor_sets_.size() < shader.desc_set_count) { if (active_descriptor_sets_.size() < shader.desc_set_count) {
active_descriptor_sets_.resize(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. // Parse push constants.
@ -1977,7 +1977,7 @@ void RendererVulkan::SwapBuffers() {
active_pipeline_ = VK_NULL_HANDLE; active_pipeline_ = VK_NULL_HANDLE;
for (auto& ds : active_descriptor_sets_) for (auto& ds : active_descriptor_sets_)
ds = VK_NULL_HANDLE; ds = VK_NULL_HANDLE;
for (auto& ds : penging_descriptor_sets_) for (auto& ds : pending_descriptor_sets_)
ds = VK_NULL_HANDLE; ds = VK_NULL_HANDLE;
BeginFrame(); BeginFrame();

2
src/engine/renderer/vulkan/renderer_vulkan.h
View File

@ -169,7 +169,7 @@ class RendererVulkan final : public Renderer {
std::vector<std::unique_ptr<DescPool>> desc_pools_; std::vector<std::unique_ptr<DescPool>> desc_pools_;
VkDescriptorSetLayout descriptor_set_layout_ = VK_NULL_HANDLE; VkDescriptorSetLayout descriptor_set_layout_ = VK_NULL_HANDLE;
std::vector<VkDescriptorSet> active_descriptor_sets_; std::vector<VkDescriptorSet> active_descriptor_sets_;
std::vector<VkDescriptorSet> penging_descriptor_sets_; std::vector<VkDescriptorSet> pending_descriptor_sets_;
VkSampler sampler_ = VK_NULL_HANDLE; VkSampler sampler_ = VK_NULL_HANDLE;