ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Draw skybox before transparent objects

Browse Source
This commit is contained in:
Benau 2022-08-22 10:53:07 +08:00
parent 4f9d40f3b2
commit 5699ede148
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
lib/graphics_engine/src/ge_vulkan_draw_call.cpp
View File

@ -13,6 +13,7 @@
#include "ge_vulkan_mesh_cache.hpp" #include "ge_vulkan_mesh_cache.hpp"
#include "ge_vulkan_mesh_scene_node.hpp" #include "ge_vulkan_mesh_scene_node.hpp"
#include "ge_vulkan_shader_manager.hpp" #include "ge_vulkan_shader_manager.hpp"
#include "ge_vulkan_skybox_renderer.hpp"
#include "ge_vulkan_texture_descriptor.hpp" #include "ge_vulkan_texture_descriptor.hpp"
#include <algorithm> #include <algorithm>
@ -231,7 +232,8 @@ void GEVulkanDrawCall::generate()
m_graphics_pipelines[cur_shader].second; m_graphics_pipelines[cur_shader].second;
std::string sorting_key = std::string sorting_key =
std::string(1, settings.m_drawing_priority) + cur_shader; std::string(1, settings.m_drawing_priority) + cur_shader;
m_cmds.push_back({ cmd, cur_shader, sorting_key, p.first }); m_cmds.push_back({ cmd, cur_shader, sorting_key, p.first,
settings.isTransparent() });
} }
} }
if (!GEVulkanFeatures::supportsBindMeshTexturesAtOnce()) if (!GEVulkanFeatures::supportsBindMeshTexturesAtOnce())
@ -261,6 +263,12 @@ void GEVulkanDrawCall::generate()
{ {
return a.m_sorting_key < b.m_sorting_key; return a.m_sorting_key < b.m_sorting_key;
}); });
std::stable_partition(m_cmds.begin(), m_cmds.end(),
[](const DrawCallData& a)
{
return !a.m_transparent;
});
} // generate } // generate
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -947,6 +955,7 @@ void GEVulkanDrawCall::render(GEVulkanDriver* vk, GEVulkanCameraSceneNode* cam,
GEVulkanFeatures::supportsBindMeshTexturesAtOnce(); GEVulkanFeatures::supportsBindMeshTexturesAtOnce();
std::string cur_pipeline = m_cmds[0].m_shader; std::string cur_pipeline = m_cmds[0].m_shader;
bool drawn_skybox = false;
if (use_multidraw) if (use_multidraw)
{ {
size_t indirect_offset = m_skinning_data_padded_size + size_t indirect_offset = m_skinning_data_padded_size +
@ -964,6 +973,20 @@ void GEVulkanDrawCall::render(GEVulkanDriver* vk, GEVulkanCameraSceneNode* cam,
indirect_offset += draw_count * indirect_size; indirect_offset += draw_count * indirect_size;
draw_count = 1; draw_count = 1;
cur_pipeline = m_cmds[i].m_shader; cur_pipeline = m_cmds[i].m_shader;
if (m_cmds[i].m_transparent && !drawn_skybox)
{
drawn_skybox = true;
GEVulkanSkyBoxRenderer::render(cmd, cam);
vkCmdBindDescriptorSets(cmd,
VK_PIPELINE_BIND_POINT_GRAPHICS, m_pipeline_layout, 0,
1, m_texture_descriptor->getDescriptorSet(), 0, NULL);
vkCmdBindDescriptorSets(cmd,
VK_PIPELINE_BIND_POINT_GRAPHICS, m_pipeline_layout, 1, 1,
&m_data_descriptor_sets[cur_frame], 0, NULL);
}
continue; continue;
} }
draw_count++; draw_count++;
@ -990,6 +1013,26 @@ void GEVulkanDrawCall::render(GEVulkanDriver* vk, GEVulkanCameraSceneNode* cam,
for (unsigned i = 0; i < m_cmds.size(); i++) for (unsigned i = 0; i < m_cmds.size(); i++)
{ {
const VkDrawIndexedIndirectCommand& cur_cmd = m_cmds[i].m_cmd; const VkDrawIndexedIndirectCommand& cur_cmd = m_cmds[i].m_cmd;
if (m_cmds[i].m_transparent && !drawn_skybox)
{
drawn_skybox = true;
GEVulkanSkyBoxRenderer::render(cmd, cam);
if (!GEVulkanFeatures::supportsBindMeshTexturesAtOnce())
{
vkCmdBindDescriptorSets(cmd,
VK_PIPELINE_BIND_POINT_GRAPHICS, m_pipeline_layout, 0,
1, &m_texture_descriptor->getDescriptorSet()[cur_mid],
0, NULL);
}
if (use_base_vertex)
{
vkCmdBindDescriptorSets(cmd,
VK_PIPELINE_BIND_POINT_GRAPHICS, m_pipeline_layout, 1,
1, &m_data_descriptor_sets[cur_frame], 0, NULL);
}
}
int mid = 0; int mid = 0;
if (use_base_vertex) if (use_base_vertex)
mid = m_materials[cur_cmd.vertexOffset]; mid = m_materials[cur_cmd.vertexOffset];
@ -1027,6 +1070,8 @@ void GEVulkanDrawCall::render(GEVulkanDriver* vk, GEVulkanCameraSceneNode* cam,
use_base_vertex ? cur_cmd.firstInstance : 0); use_base_vertex ? cur_cmd.firstInstance : 0);
} }
} }
if (!drawn_skybox)
GEVulkanSkyBoxRenderer::render(cmd, cam);
} // render } // render
} }

1
lib/graphics_engine/src/ge_vulkan_draw_call.hpp
View File

@ -63,6 +63,7 @@ struct DrawCallData
std::string m_shader; std::string m_shader;
std::string m_sorting_key; std::string m_sorting_key;
GESPMBuffer* m_mb; GESPMBuffer* m_mb;
bool m_transparent;
}; };
class GEVulkanDrawCall class GEVulkanDrawCall