diff options
| author | 2022-11-24 21:48:41 -0500 | |
|---|---|---|
| committer | 2022-11-24 21:48:41 -0500 | |
| commit | 20b62dbd30e597c6d3700a22fbde5bd10169dfb2 (patch) | |
| tree | fa6c840b3ba16eb261a30ef50a34a5d0f07587c6 /src/video_core/renderer_vulkan | |
| parent | Merge pull request #9312 from FernandoS27/pokemomma (diff) | |
| parent | Fermi2D: Cleanup and address feedback. (diff) | |
| download | yuzu-20b62dbd30e597c6d3700a22fbde5bd10169dfb2.tar.gz yuzu-20b62dbd30e597c6d3700a22fbde5bd10169dfb2.tar.xz yuzu-20b62dbd30e597c6d3700a22fbde5bd10169dfb2.zip | |
Merge pull request #9194 from FernandoS27/yfc-fermi2d
YFC - Fermi2D: Rework blit engine and add a software blitter.
Diffstat (limited to 'src/video_core/renderer_vulkan')
| -rw-r--r-- | src/video_core/renderer_vulkan/maxwell_to_vk.cpp | 1 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_rasterizer.cpp | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/renderer_vulkan/maxwell_to_vk.cpp b/src/video_core/renderer_vulkan/maxwell_to_vk.cpp index 5c156087b..1da53f203 100644 --- a/src/video_core/renderer_vulkan/maxwell_to_vk.cpp +++ b/src/video_core/renderer_vulkan/maxwell_to_vk.cpp | |||
| @@ -125,6 +125,7 @@ struct FormatTuple { | |||
| 125 | {VK_FORMAT_A1R5G5B5_UNORM_PACK16, Attachable}, // A1R5G5B5_UNORM | 125 | {VK_FORMAT_A1R5G5B5_UNORM_PACK16, Attachable}, // A1R5G5B5_UNORM |
| 126 | {VK_FORMAT_A2B10G10R10_UNORM_PACK32, Attachable | Storage}, // A2B10G10R10_UNORM | 126 | {VK_FORMAT_A2B10G10R10_UNORM_PACK32, Attachable | Storage}, // A2B10G10R10_UNORM |
| 127 | {VK_FORMAT_A2B10G10R10_UINT_PACK32, Attachable | Storage}, // A2B10G10R10_UINT | 127 | {VK_FORMAT_A2B10G10R10_UINT_PACK32, Attachable | Storage}, // A2B10G10R10_UINT |
| 128 | {VK_FORMAT_A2R10G10B10_UNORM_PACK32, Attachable | Storage}, // A2R10G10B10_UNORM | ||
| 128 | {VK_FORMAT_A1R5G5B5_UNORM_PACK16, Attachable}, // A1B5G5R5_UNORM (flipped with swizzle) | 129 | {VK_FORMAT_A1R5G5B5_UNORM_PACK16, Attachable}, // A1B5G5R5_UNORM (flipped with swizzle) |
| 129 | {VK_FORMAT_R5G5B5A1_UNORM_PACK16}, // A5B5G5R1_UNORM (specially swizzled) | 130 | {VK_FORMAT_R5G5B5A1_UNORM_PACK16}, // A5B5G5R1_UNORM (specially swizzled) |
| 130 | {VK_FORMAT_R8_UNORM, Attachable | Storage}, // R8_UNORM | 131 | {VK_FORMAT_R8_UNORM, Attachable | Storage}, // R8_UNORM |
diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index 12b13cc59..d8ad8815c 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp | |||
| @@ -542,8 +542,7 @@ bool RasterizerVulkan::AccelerateSurfaceCopy(const Tegra::Engines::Fermi2D::Surf | |||
| 542 | const Tegra::Engines::Fermi2D::Surface& dst, | 542 | const Tegra::Engines::Fermi2D::Surface& dst, |
| 543 | const Tegra::Engines::Fermi2D::Config& copy_config) { | 543 | const Tegra::Engines::Fermi2D::Config& copy_config) { |
| 544 | std::scoped_lock lock{texture_cache.mutex}; | 544 | std::scoped_lock lock{texture_cache.mutex}; |
| 545 | texture_cache.BlitImage(dst, src, copy_config); | 545 | return texture_cache.BlitImage(dst, src, copy_config); |
| 546 | return true; | ||
| 547 | } | 546 | } |
| 548 | 547 | ||
| 549 | Tegra::Engines::AccelerateDMAInterface& RasterizerVulkan::AccessAccelerateDMA() { | 548 | Tegra::Engines::AccelerateDMAInterface& RasterizerVulkan::AccessAccelerateDMA() { |