Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix spelling mistakes #478

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix spelling mistakes #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion engine/source/runtime/function/render/debugdraw/debug_draw_buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions engine/source/runtime/function/render/interface/rhi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions engine/source/runtime/function/render/interface/vulkan/vulkan_rhi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions engine/source/runtime/function/render/interface/vulkan/vulkan_rhi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion engine/source/runtime/function/render/passes/color_grading_pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion engine/source/runtime/function/render/passes/combine_ui_pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion engine/source/runtime/function/render/passes/directional_light_pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion engine/source/runtime/function/render/passes/fxaa_pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
8 changes: 4 additions & 4 deletions engine/source/runtime/function/render/passes/main_camera_pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down
14 changes: 7 additions & 7 deletions engine/source/runtime/function/render/passes/particle_pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
}

Expand All @@ -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))
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion engine/source/runtime/function/render/passes/pick_pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion engine/source/runtime/function/render/passes/point_light_pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion engine/source/runtime/function/render/passes/tone_mapping_pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions engine/source/runtime/function/render/passes/ui_pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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();
}
Expand Down