mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-26 03:55:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move conditional rendering calls closer to actual draws

Browse Source
This commit is contained in:
Marcin Mikołajczyk 2025-06-03 19:39:21 +01:00
parent 997d04ce8b
commit da38e0c2f3
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/video_core/renderer_vulkan/vk_rasterizer.cpp
View File

@ -320,6 +320,9 @@ void Rasterizer::Draw(bool is_indexed, u32 index_offset) {
const auto cmdbuf = scheduler.CommandBuffer(); const auto cmdbuf = scheduler.CommandBuffer();
cmdbuf.bindPipeline(vk::PipelineBindPoint::eGraphics, pipeline->Handle()); cmdbuf.bindPipeline(vk::PipelineBindPoint::eGraphics, pipeline->Handle());
if (active_predication) {
cmdbuf.beginConditionalRenderingEXT(&*active_predication);
}
if (is_indexed) { if (is_indexed) {
cmdbuf.drawIndexed(regs.num_indices, regs.num_instances.NumInstances(), 0, cmdbuf.drawIndexed(regs.num_indices, regs.num_instances.NumInstances(), 0,
s32(vertex_offset), instance_offset); s32(vertex_offset), instance_offset);
@ -327,7 +330,9 @@ void Rasterizer::Draw(bool is_indexed, u32 index_offset) {
cmdbuf.draw(regs.num_indices, regs.num_instances.NumInstances(), vertex_offset, cmdbuf.draw(regs.num_indices, regs.num_instances.NumInstances(), vertex_offset,
instance_offset); instance_offset);
} }
if (active_predication) {
cmdbuf.endConditionalRenderingEXT();
}
ResetBindings(); ResetBindings();
} }
@ -372,6 +377,9 @@ void Rasterizer::DrawIndirect(bool is_indexed, VAddr arg_address, u32 offset, u3
const auto cmdbuf = scheduler.CommandBuffer(); const auto cmdbuf = scheduler.CommandBuffer();
cmdbuf.bindPipeline(vk::PipelineBindPoint::eGraphics, pipeline->Handle()); cmdbuf.bindPipeline(vk::PipelineBindPoint::eGraphics, pipeline->Handle());
if (active_predication) {
cmdbuf.beginConditionalRenderingEXT(&*active_predication);
}
if (is_indexed) { if (is_indexed) {
ASSERT(sizeof(VkDrawIndexedIndirectCommand) == stride); ASSERT(sizeof(VkDrawIndexedIndirectCommand) == stride);
@ -391,7 +399,9 @@ void Rasterizer::DrawIndirect(bool is_indexed, VAddr arg_address, u32 offset, u3
cmdbuf.drawIndirect(buffer->Handle(), base, max_count, stride); cmdbuf.drawIndirect(buffer->Handle(), base, max_count, stride);
} }
} }
if (active_predication) {
cmdbuf.endConditionalRenderingEXT();
}
ResetBindings(); ResetBindings();
} }
@ -1334,9 +1344,8 @@ void Rasterizer::StartPredication(VAddr addr, bool draw_if_visible, bool wait_fo
.flags = draw_if_visible ? vk::ConditionalRenderingFlagBitsEXT::eInverted .flags = draw_if_visible ? vk::ConditionalRenderingFlagBitsEXT::eInverted
: vk::ConditionalRenderingFlagsEXT(), : vk::ConditionalRenderingFlagsEXT(),
}; };
cmdbuf.beginConditionalRenderingEXT(&conditional_rendering_info);
active_predication = true; active_predication = conditional_rendering_info;
} }
void Rasterizer::EndPredication() { void Rasterizer::EndPredication() {
@ -1347,10 +1356,8 @@ void Rasterizer::EndPredication() {
LOG_DEBUG(Render_Vulkan, ""); LOG_DEBUG(Render_Vulkan, "");
scheduler.EndRendering(); scheduler.EndRendering();
const auto cmdbuf = scheduler.CommandBuffer();
cmdbuf.endConditionalRenderingEXT();
ScopeMarkerEnd(); ScopeMarkerEnd();
active_predication = false; active_predication = std::nullopt;
} }
void Rasterizer::StartOcclusionQuery(VAddr addr) { void Rasterizer::StartOcclusionQuery(VAddr addr) {

2
src/video_core/renderer_vulkan/vk_rasterizer.h
View File

@ -131,7 +131,7 @@ private:
u32 occlusion_current_index{}; u32 occlusion_current_index{};
std::map<VAddr, u32> occlusion_index_mapping; std::map<VAddr, u32> occlusion_index_mapping;
VideoCore::Buffer occlusion_query_buffer; VideoCore::Buffer occlusion_query_buffer;
bool active_predication; std::optional<vk::ConditionalRenderingBeginInfoEXT> active_predication;
boost::container::static_vector< boost::container::static_vector<
std::pair<VideoCore::ImageId, VideoCore::TextureCache::RenderTargetDesc>, 8> std::pair<VideoCore::ImageId, VideoCore::TextureCache::RenderTargetDesc>, 8>