Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-09 15:45:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Write and flush top/bottom-screen descriptors

Browse source 
A descriptor is consumed immediately when bound to a command buffer and
cannot be updated after unless we mark the descriptors with
`UPDATE_AFTER_BIND` flags and such.

For now, just flush the writes immediately before binding the
descriptors.

Fixes all of the validation messages regarding invalid command buffers
due to updated/deleted descriptor-sets.
This commit is contained in:
Wunkolo 2023-08-24 13:09:46 -07:00
parent 57ee0a3db9
commit 1540c941d0
1 changed files with 41 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
src/core/renderer_vk/renderer_vk.cpp
View file

@ -686,38 +686,51 @@ void RendererVK::display() {
getCurrentCommandBuffer().beginRenderPass(renderPassBeginInfo, vk::SubpassContents::eInline);
// Render top screen
if (const Texture* topScreen = findRenderTexture(topScreenAddr); topScreen) {
static const std::array<float, 4> scopeColor = {{1.0f, 0.0f, 0.0f, 1.0f}};
Vulkan::DebugLabelScope debugScope(getCurrentCommandBuffer(), scopeColor, "Top Screen: %08x", topScreenAddr);
const Texture* topScreen = findRenderTexture(topScreenAddr);
const Texture* bottomScreen = findRenderTexture(bottomScreenAddr);
descriptorUpdateBatch->addImageSampler(
topDisplayPipelineDescriptorSet[frameBufferingIndex], 0, topScreen->imageView.get(), samplerCache->getSampler(sampler2D())
);
getCurrentCommandBuffer().bindDescriptorSets(
vk::PipelineBindPoint::eGraphics, displayPipelineLayout.get(), 0, {topDisplayPipelineDescriptorSet[frameBufferingIndex]}, {}
);
if (topScreen || bottomScreen) {
getCurrentCommandBuffer().bindPipeline(vk::PipelineBindPoint::eGraphics, displayPipeline.get());
getCurrentCommandBuffer().setViewport(0, vk::Viewport(0, 0, 400, 240));
getCurrentCommandBuffer().setScissor(0, vk::Rect2D({0, 0}, {400, 240}));
getCurrentCommandBuffer().draw(3, 1, 0, 0);
}
// Render bottom screen
if (const Texture* bottomScreen = findRenderTexture(bottomScreenAddr); bottomScreen) {
static const std::array<float, 4> scopeColor = {{0.0f, 1.0f, 0.0f, 1.0f}};
Vulkan::DebugLabelScope debugScope(getCurrentCommandBuffer(), scopeColor, "Bottom Screen: %08x", bottomScreenAddr);
// Update descriptors before binding to the command buffer
if (topScreen) {
descriptorUpdateBatch->addImageSampler(
topDisplayPipelineDescriptorSet[frameBufferingIndex], 0, topScreen->imageView.get(), samplerCache->getSampler(sampler2D())
);
}
descriptorUpdateBatch->addImageSampler(
bottomDisplayPipelineDescriptorSet[frameBufferingIndex], 0, bottomScreen->imageView.get(), samplerCache->getSampler(sampler2D())
);
getCurrentCommandBuffer().bindDescriptorSets(
vk::PipelineBindPoint::eGraphics, displayPipelineLayout.get(), 0, {bottomDisplayPipelineDescriptorSet[frameBufferingIndex]}, {}
);
getCurrentCommandBuffer().bindPipeline(vk::PipelineBindPoint::eGraphics, displayPipeline.get());
getCurrentCommandBuffer().setViewport(0, vk::Viewport(40, 240, 320, 240));
getCurrentCommandBuffer().setScissor(0, vk::Rect2D({40, 240}, {320, 240}));
getCurrentCommandBuffer().draw(3, 1, 0, 0);
if (bottomScreen) {
descriptorUpdateBatch->addImageSampler(
bottomDisplayPipelineDescriptorSet[frameBufferingIndex], 0, bottomScreen->imageView.get(), samplerCache->getSampler(sampler2D())
);
}
descriptorUpdateBatch->flush();
// Render top screen
if (topScreen) {
static const std::array<float, 4> scopeColor = {{1.0f, 0.0f, 0.0f, 1.0f}};
Vulkan::DebugLabelScope debugScope(getCurrentCommandBuffer(), scopeColor, "Top Screen: %08x", topScreenAddr);
getCurrentCommandBuffer().bindDescriptorSets(
vk::PipelineBindPoint::eGraphics, displayPipelineLayout.get(), 0, {topDisplayPipelineDescriptorSet[frameBufferingIndex]}, {}
);
getCurrentCommandBuffer().setViewport(0, vk::Viewport(0, 0, 400, 240));
getCurrentCommandBuffer().setScissor(0, vk::Rect2D({0, 0}, {400, 240}));
getCurrentCommandBuffer().draw(3, 1, 0, 0);
}
// Render bottom screen
if (bottomScreen) {
static const std::array<float, 4> scopeColor = {{0.0f, 1.0f, 0.0f, 1.0f}};
Vulkan::DebugLabelScope debugScope(getCurrentCommandBuffer(), scopeColor, "Bottom Screen: %08x", bottomScreenAddr);
getCurrentCommandBuffer().bindDescriptorSets(
vk::PipelineBindPoint::eGraphics, displayPipelineLayout.get(), 0, {bottomDisplayPipelineDescriptorSet[frameBufferingIndex]}, {}
);
getCurrentCommandBuffer().bindPipeline(vk::PipelineBindPoint::eGraphics, displayPipeline.get());
getCurrentCommandBuffer().setViewport(0, vk::Viewport(40, 240, 320, 240));
getCurrentCommandBuffer().setScissor(0, vk::Rect2D({40, 240}, {320, 240}));
getCurrentCommandBuffer().draw(3, 1, 0, 0);
}
}
getCurrentCommandBuffer().endRenderPass();
@ -789,9 +802,6 @@ void RendererVK::display() {
Helpers::panic("Error ending command buffer recording: %s\n", vk::to_string(endResult).c_str());
}
// Flush all descriptor writes
descriptorUpdateBatch->flush();
vk::SubmitInfo submitInfo = {};
// Wait for any previous uses of the image image to finish presenting
std::vector<vk::Semaphore> waitSemaphores;