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

Add clear-buffer support for Depth/Stencil

Browse source
This commit is contained in:
Wunkolo 2023-08-26 22:04:21 -07:00
parent 1540c941d0
commit 085d7d5568
2 changed files with 62 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/renderer_vk/renderer_vk.hpp
View file

@ -61,6 +61,7 @@ class RendererVK final : public Renderer {
u32 sizePerPixel = 0; u32 sizePerPixel = 0;
std::array<u32, 2> size = {}; std::array<u32, 2> size = {};
vk::Format format;
vk::UniqueImage image; vk::UniqueImage image;
vk::UniqueDeviceMemory imageMemory; vk::UniqueDeviceMemory imageMemory;
vk::UniqueImageView imageView; vk::UniqueImageView imageView;

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

@ -267,9 +267,11 @@ RendererVK::Texture& RendererVK::getColorRenderTexture(u32 addr, PICA::ColorFmt
newTexture.sizePerPixel = PICA::sizePerPixel(format); newTexture.sizePerPixel = PICA::sizePerPixel(format);
newTexture.size = fbSize; newTexture.size = fbSize;
newTexture.format = Vulkan::colorFormatToVulkan(format);
vk::ImageCreateInfo textureInfo = {}; vk::ImageCreateInfo textureInfo = {};
textureInfo.setImageType(vk::ImageType::e2D); textureInfo.setImageType(vk::ImageType::e2D);
textureInfo.setFormat(Vulkan::colorFormatToVulkan(format)); textureInfo.setFormat(newTexture.format);
textureInfo.setExtent(vk::Extent3D(width, height, 1)); textureInfo.setExtent(vk::Extent3D(width, height, 1));
textureInfo.setMipLevels(1); textureInfo.setMipLevels(1);
textureInfo.setArrayLayers(1); textureInfo.setArrayLayers(1);
@ -295,7 +297,7 @@ RendererVK::Texture& RendererVK::getColorRenderTexture(u32 addr, PICA::ColorFmt
vk::ImageViewCreateInfo viewInfo = {}; vk::ImageViewCreateInfo viewInfo = {};
viewInfo.image = newTexture.image.get(); viewInfo.image = newTexture.image.get();
viewInfo.viewType = vk::ImageViewType::e2D; viewInfo.viewType = vk::ImageViewType::e2D;
viewInfo.format = textureInfo.format; viewInfo.format = newTexture.format;
viewInfo.components = vk::ComponentMapping(); viewInfo.components = vk::ComponentMapping();
viewInfo.subresourceRange = vk::ImageSubresourceRange(vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1); viewInfo.subresourceRange = vk::ImageSubresourceRange(vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1);
@ -338,9 +340,11 @@ RendererVK::Texture& RendererVK::getDepthRenderTexture(u32 addr, PICA::DepthFmt
newTexture.sizePerPixel = PICA::sizePerPixel(format); newTexture.sizePerPixel = PICA::sizePerPixel(format);
newTexture.size = fbSize; newTexture.size = fbSize;
newTexture.format = Vulkan::depthFormatToVulkan(format);
vk::ImageCreateInfo textureInfo = {}; vk::ImageCreateInfo textureInfo = {};
textureInfo.setImageType(vk::ImageType::e2D); textureInfo.setImageType(vk::ImageType::e2D);
textureInfo.setFormat(Vulkan::depthFormatToVulkan(format)); textureInfo.setFormat(newTexture.format);
textureInfo.setExtent(vk::Extent3D(width, height, 1)); textureInfo.setExtent(vk::Extent3D(width, height, 1));
textureInfo.setMipLevels(1); textureInfo.setMipLevels(1);
textureInfo.setArrayLayers(1); textureInfo.setArrayLayers(1);
@ -366,7 +370,7 @@ RendererVK::Texture& RendererVK::getDepthRenderTexture(u32 addr, PICA::DepthFmt
vk::ImageViewCreateInfo viewInfo = {}; vk::ImageViewCreateInfo viewInfo = {};
viewInfo.image = newTexture.image.get(); viewInfo.image = newTexture.image.get();
viewInfo.viewType = vk::ImageViewType::e2D; viewInfo.viewType = vk::ImageViewType::e2D;
viewInfo.format = textureInfo.format; viewInfo.format = newTexture.format;
viewInfo.components = vk::ComponentMapping(); viewInfo.components = vk::ComponentMapping();
// viewInfo.subresourceRange = vk::ImageSubresourceRange(vk::ImageAspectFlagBits::eDepth | vk::ImageAspectFlagBits::eStencil, 0, 1, 0, 1); // viewInfo.subresourceRange = vk::ImageSubresourceRange(vk::ImageAspectFlagBits::eDepth | vk::ImageAspectFlagBits::eStencil, 0, 1, 0, 1);
viewInfo.subresourceRange = vk::ImageSubresourceRange(vk::ImageAspectFlagBits::eDepth, 0, 1, 0, 1); viewInfo.subresourceRange = vk::ImageSubresourceRange(vk::ImageAspectFlagBits::eDepth, 0, 1, 0, 1);
@ -1328,8 +1332,8 @@ void RendererVK::clearBuffer(u32 startAddress, u32 endAddress, u32 value, u32 co
return; return;
} }
// Color-Clear if (*vk::componentName(renderTexture->format, 0) != 'D') {
{ // Color-Clear
vk::ClearColorValue clearColor = {}; vk::ClearColorValue clearColor = {};
clearColor.float32[0] = Helpers::getBits<24, 8>(value) / 255.0f; // r clearColor.float32[0] = Helpers::getBits<24, 8>(value) / 255.0f; // r
@ -1371,6 +1375,57 @@ void RendererVK::clearBuffer(u32 startAddress, u32 endAddress, u32 value, u32 co
), ),
} }
); );
} else {
// Depth-Clear
vk::ClearDepthStencilValue clearDepthStencil = {};
if (vk::componentBits(renderTexture->format, 0) == 16) {
clearDepthStencil.depth = (value & 0xffff) / 65535.0f;
} else {
clearDepthStencil.depth = (value & 0xffffff) / 16777215.0f;
}
clearDepthStencil.stencil = (value >> 24); // Stencil
const std::array<float, 4> scopeColor = {{clearDepthStencil.depth, clearDepthStencil.depth, clearDepthStencil.depth, 1.0f}};
Vulkan::DebugLabelScope scope(
getCurrentCommandBuffer(), scopeColor, "ClearBuffer start:%08X end:%08X value:%08X control:%08X\n", startAddress, endAddress, value,
control
);
getCurrentCommandBuffer().pipelineBarrier(
vk::PipelineStageFlagBits::eAllCommands, vk::PipelineStageFlagBits::eTransfer, vk::DependencyFlags(), {}, {},
{
// renderTexture: ShaderReadOnlyOptimal -> TransferDst
vk::ImageMemoryBarrier(
vk::AccessFlagBits::eShaderRead, vk::AccessFlagBits::eTransferWrite, vk::ImageLayout::eShaderReadOnlyOptimal,
vk::ImageLayout::eTransferDstOptimal, VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED, renderTexture->image.get(),
vk::ImageSubresourceRange(vk::ImageAspectFlagBits::eDepth | vk::ImageAspectFlagBits::eStencil, 0, 1, 0, 1)
),
}
);
static vk::ImageSubresourceRange depthStencilRanges[2] = {
vk::ImageSubresourceRange(vk::ImageAspectFlagBits::eDepth, 0, 1, 0, 1),
vk::ImageSubresourceRange(vk::ImageAspectFlagBits::eStencil, 0, 1, 0, 1)};
// Clear RenderTarget
getCurrentCommandBuffer().clearDepthStencilImage(
renderTexture->image.get(), vk::ImageLayout::eTransferDstOptimal, &clearDepthStencil, vk::componentCount(renderTexture->format),
depthStencilRanges
);
getCurrentCommandBuffer().pipelineBarrier(
vk::PipelineStageFlagBits::eTransfer, vk::PipelineStageFlagBits::eAllGraphics, vk::DependencyFlags(), {}, {},
{
// renderTexture: TransferDst -> eShaderReadOnlyOptimal
vk::ImageMemoryBarrier(
vk::AccessFlagBits::eTransferWrite, vk::AccessFlagBits::eShaderRead, vk::ImageLayout::eTransferDstOptimal,
vk::ImageLayout::eShaderReadOnlyOptimal, VK_QUEUE_FAMILY_IGNORED, VK_QUEUE_FAMILY_IGNORED, renderTexture->image.get(),
vk::ImageSubresourceRange(vk::ImageAspectFlagBits::eDepth | vk::ImageAspectFlagBits::eStencil, 0, 1, 0, 1)
),
}
);
} }
} }