diff --git a/engine/source/runtime/function/render/debugdraw/debug_draw_buffer.cpp b/engine/source/runtime/function/render/debugdraw/debug_draw_buffer.cpp index dc22d58e0..ba0508ab4 100644 --- a/engine/source/runtime/function/render/debugdraw/debug_draw_buffer.cpp +++ b/engine/source/runtime/function/render/debugdraw/debug_draw_buffer.cpp @@ -196,7 +196,7 @@ namespace Piccolo RHIDescriptorSetAllocateInfo allocInfo{}; allocInfo.sType = RHI_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; allocInfo.pNext = NULL; - allocInfo.descriptorPool = m_rhi->getDescriptorPoor(); + allocInfo.descriptorPool = m_rhi->getDescriptorPool(); allocInfo.descriptorSetCount = 1; allocInfo.pSetLayouts = &m_descriptor.layout; diff --git a/engine/source/runtime/function/render/interface/rhi.h b/engine/source/runtime/function/render/interface/rhi.h index ecf8f6f75..28c93d043 100644 --- a/engine/source/runtime/function/render/interface/rhi.h +++ b/engine/source/runtime/function/render/interface/rhi.h @@ -123,8 +123,8 @@ namespace Piccolo virtual void getPhysicalDeviceProperties(RHIPhysicalDeviceProperties* pProperties) = 0; virtual RHICommandBuffer* getCurrentCommandBuffer() const = 0; virtual RHICommandBuffer* const* getCommandBufferList() const = 0; - virtual RHICommandPool* getCommandPoor() const = 0; - virtual RHIDescriptorPool* getDescriptorPoor() const = 0; + virtual RHICommandPool* getCommandPool() const = 0; + virtual RHIDescriptorPool* getDescriptorPool() const = 0; virtual RHIFence* const* getFenceList() const = 0; virtual QueueFamilyIndices getQueueFamilyIndices() const = 0; virtual RHIQueue* getGraphicsQueue() const = 0; diff --git a/engine/source/runtime/function/render/interface/vulkan/vulkan_rhi.cpp b/engine/source/runtime/function/render/interface/vulkan/vulkan_rhi.cpp index e684a0f8f..43be8bf68 100644 --- a/engine/source/runtime/function/render/interface/vulkan/vulkan_rhi.cpp +++ b/engine/source/runtime/function/render/interface/vulkan/vulkan_rhi.cpp @@ -3552,11 +3552,11 @@ namespace Piccolo { return m_command_buffers; } - RHICommandPool* VulkanRHI::getCommandPoor() const + RHICommandPool* VulkanRHI::getCommandPool() const { return m_rhi_command_pool; } - RHIDescriptorPool* VulkanRHI::getDescriptorPoor() const + RHIDescriptorPool* VulkanRHI::getDescriptorPool() const { return m_descriptor_pool; } diff --git a/engine/source/runtime/function/render/interface/vulkan/vulkan_rhi.h b/engine/source/runtime/function/render/interface/vulkan/vulkan_rhi.h index 4d0f9bf96..d58203fb2 100644 --- a/engine/source/runtime/function/render/interface/vulkan/vulkan_rhi.h +++ b/engine/source/runtime/function/render/interface/vulkan/vulkan_rhi.h @@ -117,8 +117,8 @@ namespace Piccolo void getPhysicalDeviceProperties(RHIPhysicalDeviceProperties* pProperties) override; RHICommandBuffer* getCurrentCommandBuffer() const override; RHICommandBuffer* const* getCommandBufferList() const override; - RHICommandPool* getCommandPoor() const override; - RHIDescriptorPool* getDescriptorPoor()const override; + RHICommandPool* getCommandPool() const override; + RHIDescriptorPool* getDescriptorPool()const override; RHIFence* const* getFenceList() const override; QueueFamilyIndices getQueueFamilyIndices() const override; RHIQueue* getGraphicsQueue() const override; diff --git a/engine/source/runtime/function/render/passes/color_grading_pass.cpp b/engine/source/runtime/function/render/passes/color_grading_pass.cpp index c216626c1..4d68b9d65 100644 --- a/engine/source/runtime/function/render/passes/color_grading_pass.cpp +++ b/engine/source/runtime/function/render/passes/color_grading_pass.cpp @@ -194,7 +194,7 @@ namespace Piccolo RHIDescriptorSetAllocateInfo post_process_global_descriptor_set_alloc_info; post_process_global_descriptor_set_alloc_info.sType = RHI_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; post_process_global_descriptor_set_alloc_info.pNext = NULL; - post_process_global_descriptor_set_alloc_info.descriptorPool = m_rhi->getDescriptorPoor(); + post_process_global_descriptor_set_alloc_info.descriptorPool = m_rhi->getDescriptorPool(); post_process_global_descriptor_set_alloc_info.descriptorSetCount = 1; post_process_global_descriptor_set_alloc_info.pSetLayouts = &m_descriptor_infos[0].layout; diff --git a/engine/source/runtime/function/render/passes/combine_ui_pass.cpp b/engine/source/runtime/function/render/passes/combine_ui_pass.cpp index 1b368a4d8..5583afae7 100644 --- a/engine/source/runtime/function/render/passes/combine_ui_pass.cpp +++ b/engine/source/runtime/function/render/passes/combine_ui_pass.cpp @@ -195,7 +195,7 @@ namespace Piccolo RHIDescriptorSetAllocateInfo post_process_global_descriptor_set_alloc_info; post_process_global_descriptor_set_alloc_info.sType = RHI_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; post_process_global_descriptor_set_alloc_info.pNext = NULL; - post_process_global_descriptor_set_alloc_info.descriptorPool = m_rhi->getDescriptorPoor(); + post_process_global_descriptor_set_alloc_info.descriptorPool = m_rhi->getDescriptorPool(); post_process_global_descriptor_set_alloc_info.descriptorSetCount = 1; post_process_global_descriptor_set_alloc_info.pSetLayouts = &m_descriptor_infos[0].layout; diff --git a/engine/source/runtime/function/render/passes/directional_light_pass.cpp b/engine/source/runtime/function/render/passes/directional_light_pass.cpp index ca0dccf5f..c8605dfe0 100644 --- a/engine/source/runtime/function/render/passes/directional_light_pass.cpp +++ b/engine/source/runtime/function/render/passes/directional_light_pass.cpp @@ -364,7 +364,7 @@ namespace Piccolo mesh_directional_light_shadow_global_descriptor_set_alloc_info.sType = RHI_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; mesh_directional_light_shadow_global_descriptor_set_alloc_info.pNext = NULL; - mesh_directional_light_shadow_global_descriptor_set_alloc_info.descriptorPool = m_rhi->getDescriptorPoor(); + mesh_directional_light_shadow_global_descriptor_set_alloc_info.descriptorPool = m_rhi->getDescriptorPool(); mesh_directional_light_shadow_global_descriptor_set_alloc_info.descriptorSetCount = 1; mesh_directional_light_shadow_global_descriptor_set_alloc_info.pSetLayouts = &m_descriptor_infos[0].layout; diff --git a/engine/source/runtime/function/render/passes/fxaa_pass.cpp b/engine/source/runtime/function/render/passes/fxaa_pass.cpp index 4b0176fa9..ddfc4b116 100644 --- a/engine/source/runtime/function/render/passes/fxaa_pass.cpp +++ b/engine/source/runtime/function/render/passes/fxaa_pass.cpp @@ -198,7 +198,7 @@ namespace Piccolo RHIDescriptorSetAllocateInfo post_process_global_descriptor_set_alloc_info; post_process_global_descriptor_set_alloc_info.sType = RHI_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; post_process_global_descriptor_set_alloc_info.pNext = NULL; - post_process_global_descriptor_set_alloc_info.descriptorPool = m_rhi->getDescriptorPoor(); + post_process_global_descriptor_set_alloc_info.descriptorPool = m_rhi->getDescriptorPool(); post_process_global_descriptor_set_alloc_info.descriptorSetCount = 1; post_process_global_descriptor_set_alloc_info.pSetLayouts = &m_descriptor_infos[0].layout; diff --git a/engine/source/runtime/function/render/passes/main_camera_pass.cpp b/engine/source/runtime/function/render/passes/main_camera_pass.cpp index 3300e4638..3e2e3040e 100644 --- a/engine/source/runtime/function/render/passes/main_camera_pass.cpp +++ b/engine/source/runtime/function/render/passes/main_camera_pass.cpp @@ -1528,7 +1528,7 @@ namespace Piccolo RHIDescriptorSetAllocateInfo mesh_global_descriptor_set_alloc_info; mesh_global_descriptor_set_alloc_info.sType = RHI_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; mesh_global_descriptor_set_alloc_info.pNext = NULL; - mesh_global_descriptor_set_alloc_info.descriptorPool = m_rhi->getDescriptorPoor(); + mesh_global_descriptor_set_alloc_info.descriptorPool = m_rhi->getDescriptorPool(); mesh_global_descriptor_set_alloc_info.descriptorSetCount = 1; mesh_global_descriptor_set_alloc_info.pSetLayouts = &m_descriptor_infos[_mesh_global].layout; @@ -1656,7 +1656,7 @@ namespace Piccolo RHIDescriptorSetAllocateInfo skybox_descriptor_set_alloc_info; skybox_descriptor_set_alloc_info.sType = RHI_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; skybox_descriptor_set_alloc_info.pNext = NULL; - skybox_descriptor_set_alloc_info.descriptorPool = m_rhi->getDescriptorPoor(); + skybox_descriptor_set_alloc_info.descriptorPool = m_rhi->getDescriptorPool(); skybox_descriptor_set_alloc_info.descriptorSetCount = 1; skybox_descriptor_set_alloc_info.pSetLayouts = &m_descriptor_infos[_skybox].layout; @@ -1705,7 +1705,7 @@ namespace Piccolo RHIDescriptorSetAllocateInfo axis_descriptor_set_alloc_info; axis_descriptor_set_alloc_info.sType = RHI_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; axis_descriptor_set_alloc_info.pNext = NULL; - axis_descriptor_set_alloc_info.descriptorPool = m_rhi->getDescriptorPoor(); + axis_descriptor_set_alloc_info.descriptorPool = m_rhi->getDescriptorPool(); axis_descriptor_set_alloc_info.descriptorSetCount = 1; axis_descriptor_set_alloc_info.pSetLayouts = &m_descriptor_infos[_axis].layout; @@ -1757,7 +1757,7 @@ namespace Piccolo RHIDescriptorSetAllocateInfo gbuffer_light_global_descriptor_set_alloc_info; gbuffer_light_global_descriptor_set_alloc_info.sType = RHI_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; gbuffer_light_global_descriptor_set_alloc_info.pNext = NULL; - gbuffer_light_global_descriptor_set_alloc_info.descriptorPool = m_rhi->getDescriptorPoor(); + gbuffer_light_global_descriptor_set_alloc_info.descriptorPool = m_rhi->getDescriptorPool(); gbuffer_light_global_descriptor_set_alloc_info.descriptorSetCount = 1; gbuffer_light_global_descriptor_set_alloc_info.pSetLayouts = &m_descriptor_infos[_deferred_lighting].layout; diff --git a/engine/source/runtime/function/render/passes/particle_pass.cpp b/engine/source/runtime/function/render/passes/particle_pass.cpp index cadafeed8..6e8edef89 100644 --- a/engine/source/runtime/function/render/passes/particle_pass.cpp +++ b/engine/source/runtime/function/render/passes/particle_pass.cpp @@ -408,7 +408,7 @@ namespace Piccolo RHIDescriptorSetAllocateInfo particlebillboard_global_descriptor_set_alloc_info; particlebillboard_global_descriptor_set_alloc_info.sType = RHI_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; particlebillboard_global_descriptor_set_alloc_info.pNext = NULL; - particlebillboard_global_descriptor_set_alloc_info.descriptorPool = m_rhi->getDescriptorPoor(); + particlebillboard_global_descriptor_set_alloc_info.descriptorPool = m_rhi->getDescriptorPool(); particlebillboard_global_descriptor_set_alloc_info.descriptorSetCount = 1; particlebillboard_global_descriptor_set_alloc_info.pSetLayouts = &m_descriptor_infos[2].layout; @@ -595,7 +595,7 @@ namespace Piccolo // Copy to staging buffer RHICommandBufferAllocateInfo cmdBufAllocateInfo {}; cmdBufAllocateInfo.sType = RHI_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; - cmdBufAllocateInfo.commandPool = m_rhi->getCommandPoor(); + cmdBufAllocateInfo.commandPool = m_rhi->getCommandPool(); cmdBufAllocateInfo.level = RHI_COMMAND_BUFFER_LEVEL_PRIMARY; cmdBufAllocateInfo.commandBufferCount = 1; RHICommandBuffer* copyCmd; @@ -650,7 +650,7 @@ namespace Piccolo } m_rhi->destroyFence(fence); - m_rhi->freeCommandBuffers(m_rhi->getCommandPoor(), 1, copyCmd); + m_rhi->freeCommandBuffers(m_rhi->getCommandPool(), 1, copyCmd); } const VkDeviceSize staggingBuferSize = s_max_particles * sizeof(Particle); @@ -709,7 +709,7 @@ namespace Piccolo // Copy to staging buffer RHICommandBufferAllocateInfo cmdBufAllocateInfo {}; cmdBufAllocateInfo.sType = RHI_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; - cmdBufAllocateInfo.commandPool = m_rhi->getCommandPoor(); + cmdBufAllocateInfo.commandPool = m_rhi->getCommandPool(); cmdBufAllocateInfo.level = RHI_COMMAND_BUFFER_LEVEL_PRIMARY; cmdBufAllocateInfo.commandBufferCount = 1; RHICommandBuffer* copyCmd; @@ -763,7 +763,7 @@ namespace Piccolo } m_rhi->destroyFence(fence); - m_rhi->freeCommandBuffers(m_rhi->getCommandPoor(), 1, copyCmd); + m_rhi->freeCommandBuffers(m_rhi->getCommandPool(), 1, copyCmd); } } @@ -783,7 +783,7 @@ namespace Piccolo RHICommandBufferAllocateInfo cmdBufAllocateInfo {}; cmdBufAllocateInfo.sType = RHI_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; - cmdBufAllocateInfo.commandPool = m_rhi->getCommandPoor(); + cmdBufAllocateInfo.commandPool = m_rhi->getCommandPool(); cmdBufAllocateInfo.level = RHI_COMMAND_BUFFER_LEVEL_PRIMARY; cmdBufAllocateInfo.commandBufferCount = 1; if (RHI_SUCCESS != m_rhi->allocateCommandBuffers(&cmdBufAllocateInfo, m_compute_command_buffer)) @@ -1225,7 +1225,7 @@ namespace Piccolo { RHIDescriptorSetAllocateInfo particle_descriptor_set_alloc_info; particle_descriptor_set_alloc_info.sType = RHI_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; - particle_descriptor_set_alloc_info.descriptorPool = m_rhi->getDescriptorPoor(); + particle_descriptor_set_alloc_info.descriptorPool = m_rhi->getDescriptorPool(); m_descriptor_infos.resize(3 * m_emitter_count); for (int eid = 0; eid < m_emitter_count; ++eid) diff --git a/engine/source/runtime/function/render/passes/pick_pass.cpp b/engine/source/runtime/function/render/passes/pick_pass.cpp index 90ad4a1a6..f3d7ac788 100644 --- a/engine/source/runtime/function/render/passes/pick_pass.cpp +++ b/engine/source/runtime/function/render/passes/pick_pass.cpp @@ -328,7 +328,7 @@ namespace Piccolo RHIDescriptorSetAllocateInfo mesh_inefficient_pick_global_descriptor_set_alloc_info; mesh_inefficient_pick_global_descriptor_set_alloc_info.sType = RHI_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; mesh_inefficient_pick_global_descriptor_set_alloc_info.pNext = NULL; - mesh_inefficient_pick_global_descriptor_set_alloc_info.descriptorPool = m_rhi->getDescriptorPoor(); + mesh_inefficient_pick_global_descriptor_set_alloc_info.descriptorPool = m_rhi->getDescriptorPool(); mesh_inefficient_pick_global_descriptor_set_alloc_info.descriptorSetCount = 1; mesh_inefficient_pick_global_descriptor_set_alloc_info.pSetLayouts = &m_descriptor_infos[0].layout; diff --git a/engine/source/runtime/function/render/passes/point_light_pass.cpp b/engine/source/runtime/function/render/passes/point_light_pass.cpp index e503cb1ca..861691418 100644 --- a/engine/source/runtime/function/render/passes/point_light_pass.cpp +++ b/engine/source/runtime/function/render/passes/point_light_pass.cpp @@ -382,7 +382,7 @@ namespace Piccolo RHIDescriptorSetAllocateInfo mesh_point_light_shadow_global_descriptor_set_alloc_info; mesh_point_light_shadow_global_descriptor_set_alloc_info.sType = RHI_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; mesh_point_light_shadow_global_descriptor_set_alloc_info.pNext = NULL; - mesh_point_light_shadow_global_descriptor_set_alloc_info.descriptorPool = m_rhi->getDescriptorPoor(); + mesh_point_light_shadow_global_descriptor_set_alloc_info.descriptorPool = m_rhi->getDescriptorPool(); mesh_point_light_shadow_global_descriptor_set_alloc_info.descriptorSetCount = 1; mesh_point_light_shadow_global_descriptor_set_alloc_info.pSetLayouts = &m_descriptor_infos[0].layout; diff --git a/engine/source/runtime/function/render/passes/tone_mapping_pass.cpp b/engine/source/runtime/function/render/passes/tone_mapping_pass.cpp index b824e664a..740c9b4bf 100644 --- a/engine/source/runtime/function/render/passes/tone_mapping_pass.cpp +++ b/engine/source/runtime/function/render/passes/tone_mapping_pass.cpp @@ -186,7 +186,7 @@ namespace Piccolo RHIDescriptorSetAllocateInfo post_process_global_descriptor_set_alloc_info; post_process_global_descriptor_set_alloc_info.sType = RHI_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; post_process_global_descriptor_set_alloc_info.pNext = NULL; - post_process_global_descriptor_set_alloc_info.descriptorPool = m_rhi->getDescriptorPoor(); + post_process_global_descriptor_set_alloc_info.descriptorPool = m_rhi->getDescriptorPool(); post_process_global_descriptor_set_alloc_info.descriptorSetCount = 1; post_process_global_descriptor_set_alloc_info.pSetLayouts = &m_descriptor_infos[0].layout; diff --git a/engine/source/runtime/function/render/passes/ui_pass.cpp b/engine/source/runtime/function/render/passes/ui_pass.cpp index 0caef5c89..4ca57a4e1 100644 --- a/engine/source/runtime/function/render/passes/ui_pass.cpp +++ b/engine/source/runtime/function/render/passes/ui_pass.cpp @@ -46,7 +46,7 @@ namespace Piccolo RHICommandBufferAllocateInfo allocInfo = {}; allocInfo.sType = RHI_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; allocInfo.level = RHI_COMMAND_BUFFER_LEVEL_PRIMARY; - allocInfo.commandPool = m_rhi->getCommandPoor(); + allocInfo.commandPool = m_rhi->getCommandPool(); allocInfo.commandBufferCount = 1; RHICommandBuffer* commandBuffer = new VulkanCommandBuffer(); @@ -79,7 +79,7 @@ namespace Piccolo m_rhi->queueSubmit(m_rhi->getGraphicsQueue(), 1, &submitInfo, RHI_NULL_HANDLE); m_rhi->queueWaitIdle(m_rhi->getGraphicsQueue()); - m_rhi->freeCommandBuffers(m_rhi->getCommandPoor(), 1, commandBuffer); + m_rhi->freeCommandBuffers(m_rhi->getCommandPool(), 1, commandBuffer); ImGui_ImplVulkan_DestroyFontUploadObjects(); }