texture cache: share color attachment rendering setup

This commit is contained in:
nmzik
2026-10-22 10:57:39 +02:00
parent 5b315a9ea7
commit b6495a5b67
2 changed files with 42 additions and 23 deletions
+36 -23
View File
@@ -1577,29 +1577,8 @@ void TextureCache::ClearImage(CommandBuffer& command, ImageId id, vk::Format for
if (format != image.backing.format || (image.info.IsVolume() && !full_image)) {
EXIT_NOT_IMPLEMENTED(range.aspectMask != vk::ImageAspectFlagBits::eColor ||
range.levelCount != 1);
ImageViewInfo view {};
view.format = format;
view.type = range.layerCount == 1 ? vk::ImageViewType::e2D : vk::ImageViewType::e2DArray;
view.base_level = range.baseMipLevel;
view.base_layer = range.baseArrayLayer;
view.layer_count = range.layerCount;
view.usage = vk::ImageUsageFlagBits::eColorAttachment;
image.Transit(vk::ImageLayout::eColorAttachmentOptimal,
vk::AccessFlagBits2::eColorAttachmentWrite, {}, command.Handle());
vk::RenderingAttachmentInfo attachment {};
attachment.imageView = image.FindView(view);
attachment.imageLayout = vk::ImageLayout::eColorAttachmentOptimal;
attachment.loadOp = vk::AttachmentLoadOp::eClear;
attachment.storeOp = vk::AttachmentStoreOp::eStore;
attachment.clearValue = clear;
vk::RenderingInfo rendering {};
rendering.renderArea.extent = {
std::max(image.info.extent.width >> range.baseMipLevel, 1u),
std::max(image.info.extent.height >> range.baseMipLevel, 1u)};
rendering.layerCount = range.layerCount;
rendering.colorAttachmentCount = 1;
rendering.pColorAttachments = &attachment;
command.Handle().beginRendering(&rendering);
BeginColorRendering(image, format, range.baseMipLevel, range.baseArrayLayer,
range.layerCount, &clear, command.Handle());
command.Handle().endRendering();
CommitGpuWrite(image);
return;
@@ -1622,6 +1601,40 @@ void TextureCache::ClearImage(CommandBuffer& command, ImageId id, vk::Format for
CommitGpuWrite(image);
}
vk::Rect2D TextureCache::BeginColorRendering(Image& image, vk::Format format, uint32_t level,
uint32_t layer, uint32_t layers,
const vk::ClearValue* clear,
vk::CommandBuffer command) {
ImageViewInfo view {};
view.format = format;
view.type = layers == 1 ? vk::ImageViewType::e2D : vk::ImageViewType::e2DArray;
view.base_level = level;
view.base_layer = layer;
view.layer_count = layers;
view.usage = vk::ImageUsageFlagBits::eColorAttachment;
image.Transit(vk::ImageLayout::eColorAttachmentOptimal,
vk::AccessFlagBits2::eColorAttachmentRead |
vk::AccessFlagBits2::eColorAttachmentWrite,
{}, command);
vk::RenderingAttachmentInfo attachment {};
attachment.imageView = image.FindView(view);
attachment.imageLayout = vk::ImageLayout::eColorAttachmentOptimal;
attachment.loadOp = vk::AttachmentLoadOp::eLoad;
attachment.storeOp = vk::AttachmentStoreOp::eStore;
if (clear != nullptr) {
attachment.loadOp = vk::AttachmentLoadOp::eClear;
attachment.clearValue = *clear;
}
vk::RenderingInfo rendering {};
rendering.renderArea.extent = {std::max(image.info.extent.width >> level, 1u),
std::max(image.info.extent.height >> level, 1u)};
rendering.layerCount = layers;
rendering.colorAttachmentCount = 1;
rendering.pColorAttachments = &attachment;
command.beginRendering(&rendering);
return rendering.renderArea;
}
void TextureCache::InvalidateMemory(uint64_t address, uint64_t size) {
if (!GuestRange {address, size}.Valid()) {
EXIT("TextureCache: invalid memory-invalidation range\n");
+6
View File
@@ -150,6 +150,12 @@ private:
// Caller holds m_lock. Volume layer ranges select depth slices.
void ClearImage(CommandBuffer& command, ImageId id, vk::Format format,
const vk::ImageSubresourceRange& range, const vk::ClearValue& clear);
// Caller holds m_lock and ends rendering. Begins rendering `layers` layers of one color mip
// through a `format` view, clearing them or, when `clear` is null, loading them; returns the
// render area.
vk::Rect2D BeginColorRendering(Image& image, vk::Format format, uint32_t level,
uint32_t layer, uint32_t layers, const vk::ClearValue* clear,
vk::CommandBuffer command);
void PrepareImageCopy(Image& image);
void RefreshCopySource(ImageId id);
[[nodiscard]] bool CopyD16(Image& destination, Image& source);