summaryrefslogtreecommitdiff
path: root/src/video_core/renderer_vulkan
diff options
context:
space:
mode:
authorGravatar Liam2024-01-26 16:10:21 -0500
committerGravatar Liam2024-02-09 09:20:53 -0500
commit0cb413c3d31b93ce347e997b9674c304094dab09 (patch)
tree959ef73963ea1e7975690d31eaf4ddc2f2ad6e19 /src/video_core/renderer_vulkan
parentnvnflinger/gpu: implement blending (diff)
downloadyuzu-0cb413c3d31b93ce347e997b9674c304094dab09.tar.gz
yuzu-0cb413c3d31b93ce347e997b9674c304094dab09.tar.xz
yuzu-0cb413c3d31b93ce347e997b9674c304094dab09.zip
nvnflinger/gpu: implement applet capture
Diffstat (limited to 'src/video_core/renderer_vulkan')
-rw-r--r--src/video_core/renderer_vulkan/renderer_vulkan.cpp108
-rw-r--r--src/video_core/renderer_vulkan/renderer_vulkan.h12
2 files changed, 93 insertions, 27 deletions
diff --git a/src/video_core/renderer_vulkan/renderer_vulkan.cpp b/src/video_core/renderer_vulkan/renderer_vulkan.cpp
index c7c234fd8..c148efef2 100644
--- a/src/video_core/renderer_vulkan/renderer_vulkan.cpp
+++ b/src/video_core/renderer_vulkan/renderer_vulkan.cpp
@@ -19,6 +19,7 @@
19#include "core/core_timing.h" 19#include "core/core_timing.h"
20#include "core/frontend/graphics_context.h" 20#include "core/frontend/graphics_context.h"
21#include "core/telemetry_session.h" 21#include "core/telemetry_session.h"
22#include "video_core/capture.h"
22#include "video_core/gpu.h" 23#include "video_core/gpu.h"
23#include "video_core/renderer_vulkan/present/util.h" 24#include "video_core/renderer_vulkan/present/util.h"
24#include "video_core/renderer_vulkan/renderer_vulkan.h" 25#include "video_core/renderer_vulkan/renderer_vulkan.h"
@@ -38,6 +39,20 @@
38 39
39namespace Vulkan { 40namespace Vulkan {
40namespace { 41namespace {
42
43constexpr VkExtent2D CaptureImageSize{
44 .width = VideoCore::Capture::LinearWidth,
45 .height = VideoCore::Capture::LinearHeight,
46};
47
48constexpr VkExtent3D CaptureImageExtent{
49 .width = VideoCore::Capture::LinearWidth,
50 .height = VideoCore::Capture::LinearHeight,
51 .depth = VideoCore::Capture::LinearDepth,
52};
53
54constexpr VkFormat CaptureFormat = VK_FORMAT_A8B8G8R8_UNORM_PACK32;
55
41std::string GetReadableVersion(u32 version) { 56std::string GetReadableVersion(u32 version) {
42 return fmt::format("{}.{}.{}", VK_VERSION_MAJOR(version), VK_VERSION_MINOR(version), 57 return fmt::format("{}.{}.{}", VK_VERSION_MAJOR(version), VK_VERSION_MINOR(version),
43 VK_VERSION_PATCH(version)); 58 VK_VERSION_PATCH(version));
@@ -100,11 +115,11 @@ RendererVulkan::RendererVulkan(Core::TelemetrySession& telemetry_session_,
100 present_manager(instance, render_window, device, memory_allocator, scheduler, swapchain, 115 present_manager(instance, render_window, device, memory_allocator, scheduler, swapchain,
101 surface), 116 surface),
102 blit_swapchain(device_memory, device, memory_allocator, present_manager, scheduler), 117 blit_swapchain(device_memory, device, memory_allocator, present_manager, scheduler),
103 blit_screenshot(device_memory, device, memory_allocator, present_manager, scheduler), 118 blit_capture(device_memory, device, memory_allocator, present_manager, scheduler),
104 blit_application_layer(device_memory, device, memory_allocator, present_manager, scheduler), 119 blit_applet(device_memory, device, memory_allocator, present_manager, scheduler),
105 rasterizer(render_window, gpu, device_memory, device, memory_allocator, state_tracker, 120 rasterizer(render_window, gpu, device_memory, device, memory_allocator, state_tracker,
106 scheduler), 121 scheduler),
107 application_frame() { 122 applet_frame() {
108 if (Settings::values.renderer_force_max_clock.GetValue() && device.ShouldBoostClocks()) { 123 if (Settings::values.renderer_force_max_clock.GetValue() && device.ShouldBoostClocks()) {
109 turbo_mode.emplace(instance, dld); 124 turbo_mode.emplace(instance, dld);
110 scheduler.RegisterOnSubmit([this] { turbo_mode->QueueSubmitted(); }); 125 scheduler.RegisterOnSubmit([this] { turbo_mode->QueueSubmitted(); });
@@ -127,6 +142,8 @@ void RendererVulkan::Composite(std::span<const Tegra::FramebufferConfig> framebu
127 142
128 SCOPE_EXIT({ render_window.OnFrameDisplayed(); }); 143 SCOPE_EXIT({ render_window.OnFrameDisplayed(); });
129 144
145 RenderAppletCaptureLayer(framebuffers);
146
130 if (!render_window.IsShown()) { 147 if (!render_window.IsShown()) {
131 return; 148 return;
132 } 149 }
@@ -169,30 +186,20 @@ void RendererVulkan::Report() const {
169 telemetry_session.AddField(field, "GPU_Vulkan_Extensions", extensions); 186 telemetry_session.AddField(field, "GPU_Vulkan_Extensions", extensions);
170} 187}
171 188
172void Vulkan::RendererVulkan::RenderScreenshot( 189vk::Buffer RendererVulkan::RenderToBuffer(std::span<const Tegra::FramebufferConfig> framebuffers,
173 std::span<const Tegra::FramebufferConfig> framebuffers) { 190 const Layout::FramebufferLayout& layout, VkFormat format,
174 if (!renderer_settings.screenshot_requested) { 191 VkDeviceSize buffer_size) {
175 return;
176 }
177
178 constexpr VkFormat ScreenshotFormat{VK_FORMAT_B8G8R8A8_UNORM};
179 const Layout::FramebufferLayout layout{renderer_settings.screenshot_framebuffer_layout};
180
181 auto frame = [&]() { 192 auto frame = [&]() {
182 Frame f{}; 193 Frame f{};
183 f.image = CreateWrappedImage(memory_allocator, VkExtent2D{layout.width, layout.height}, 194 f.image =
184 ScreenshotFormat); 195 CreateWrappedImage(memory_allocator, VkExtent2D{layout.width, layout.height}, format);
185 f.image_view = CreateWrappedImageView(device, f.image, ScreenshotFormat); 196 f.image_view = CreateWrappedImageView(device, f.image, format);
186 f.framebuffer = blit_screenshot.CreateFramebuffer(layout, *f.image_view, ScreenshotFormat); 197 f.framebuffer = blit_capture.CreateFramebuffer(layout, *f.image_view, format);
187 return f; 198 return f;
188 }(); 199 }();
189 200
190 blit_screenshot.DrawToFrame(rasterizer, &frame, framebuffers, layout, 1, 201 auto dst_buffer = CreateWrappedBuffer(memory_allocator, buffer_size, MemoryUsage::Download);
191 VK_FORMAT_B8G8R8A8_UNORM); 202 blit_capture.DrawToFrame(rasterizer, &frame, framebuffers, layout, 1, format);
192
193 const auto dst_buffer = CreateWrappedBuffer(
194 memory_allocator, static_cast<VkDeviceSize>(layout.width * layout.height * 4),
195 MemoryUsage::Download);
196 203
197 scheduler.RequestOutsideRenderPassOperationContext(); 204 scheduler.RequestOutsideRenderPassOperationContext();
198 scheduler.Record([&](vk::CommandBuffer cmdbuf) { 205 scheduler.Record([&](vk::CommandBuffer cmdbuf) {
@@ -200,15 +207,68 @@ void Vulkan::RendererVulkan::RenderScreenshot(
200 VkExtent3D{layout.width, layout.height, 1}); 207 VkExtent3D{layout.width, layout.height, 1});
201 }); 208 });
202 209
203 // Ensure the copy is fully completed before saving the screenshot 210 // Ensure the copy is fully completed before saving the capture
204 scheduler.Finish(); 211 scheduler.Finish();
205 212
206 // Copy backing image data to the QImage screenshot buffer 213 // Copy backing image data to the capture buffer
207 dst_buffer.Invalidate(); 214 dst_buffer.Invalidate();
215 return dst_buffer;
216}
217
218void RendererVulkan::RenderScreenshot(std::span<const Tegra::FramebufferConfig> framebuffers) {
219 if (!renderer_settings.screenshot_requested) {
220 return;
221 }
222
223 const auto& layout{renderer_settings.screenshot_framebuffer_layout};
224 const auto dst_buffer = RenderToBuffer(framebuffers, layout, VK_FORMAT_B8G8R8A8_UNORM,
225 layout.width * layout.height * 4);
226
208 std::memcpy(renderer_settings.screenshot_bits, dst_buffer.Mapped().data(), 227 std::memcpy(renderer_settings.screenshot_bits, dst_buffer.Mapped().data(),
209 dst_buffer.Mapped().size()); 228 dst_buffer.Mapped().size());
210 renderer_settings.screenshot_complete_callback(false); 229 renderer_settings.screenshot_complete_callback(false);
211 renderer_settings.screenshot_requested = false; 230 renderer_settings.screenshot_requested = false;
212} 231}
213 232
233std::vector<u8> RendererVulkan::GetAppletCaptureBuffer() {
234 using namespace VideoCore::Capture;
235
236 std::vector<u8> out(VideoCore::Capture::TiledSize);
237
238 if (!applet_frame.image) {
239 return out;
240 }
241
242 const auto dst_buffer =
243 CreateWrappedBuffer(memory_allocator, VideoCore::Capture::TiledSize, MemoryUsage::Download);
244
245 scheduler.RequestOutsideRenderPassOperationContext();
246 scheduler.Record([&](vk::CommandBuffer cmdbuf) {
247 DownloadColorImage(cmdbuf, *applet_frame.image, *dst_buffer, CaptureImageExtent);
248 });
249
250 // Ensure the copy is fully completed before writing the capture
251 scheduler.Finish();
252
253 // Swizzle image data to the capture buffer
254 dst_buffer.Invalidate();
255 Tegra::Texture::SwizzleTexture(out, dst_buffer.Mapped(), BytesPerPixel, LinearWidth,
256 LinearHeight, LinearDepth, BlockHeight, BlockDepth);
257
258 return out;
259}
260
261void RendererVulkan::RenderAppletCaptureLayer(
262 std::span<const Tegra::FramebufferConfig> framebuffers) {
263 if (!applet_frame.image) {
264 applet_frame.image = CreateWrappedImage(memory_allocator, CaptureImageSize, CaptureFormat);
265 applet_frame.image_view = CreateWrappedImageView(device, applet_frame.image, CaptureFormat);
266 applet_frame.framebuffer = blit_applet.CreateFramebuffer(
267 VideoCore::Capture::Layout, *applet_frame.image_view, CaptureFormat);
268 }
269
270 blit_applet.DrawToFrame(rasterizer, &applet_frame, framebuffers, VideoCore::Capture::Layout, 1,
271 CaptureFormat);
272}
273
214} // namespace Vulkan 274} // namespace Vulkan
diff --git a/src/video_core/renderer_vulkan/renderer_vulkan.h b/src/video_core/renderer_vulkan/renderer_vulkan.h
index ed9c7af7f..fb9d83412 100644
--- a/src/video_core/renderer_vulkan/renderer_vulkan.h
+++ b/src/video_core/renderer_vulkan/renderer_vulkan.h
@@ -48,6 +48,8 @@ public:
48 48
49 void Composite(std::span<const Tegra::FramebufferConfig> framebuffers) override; 49 void Composite(std::span<const Tegra::FramebufferConfig> framebuffers) override;
50 50
51 std::vector<u8> GetAppletCaptureBuffer() override;
52
51 VideoCore::RasterizerInterface* ReadRasterizer() override { 53 VideoCore::RasterizerInterface* ReadRasterizer() override {
52 return &rasterizer; 54 return &rasterizer;
53 } 55 }
@@ -59,7 +61,11 @@ public:
59private: 61private:
60 void Report() const; 62 void Report() const;
61 63
64 vk::Buffer RenderToBuffer(std::span<const Tegra::FramebufferConfig> framebuffers,
65 const Layout::FramebufferLayout& layout, VkFormat format,
66 VkDeviceSize buffer_size);
62 void RenderScreenshot(std::span<const Tegra::FramebufferConfig> framebuffers); 67 void RenderScreenshot(std::span<const Tegra::FramebufferConfig> framebuffers);
68 void RenderAppletCaptureLayer(std::span<const Tegra::FramebufferConfig> framebuffers);
63 69
64 Core::TelemetrySession& telemetry_session; 70 Core::TelemetrySession& telemetry_session;
65 Tegra::MaxwellDeviceMemoryManager& device_memory; 71 Tegra::MaxwellDeviceMemoryManager& device_memory;
@@ -79,12 +85,12 @@ private:
79 Swapchain swapchain; 85 Swapchain swapchain;
80 PresentManager present_manager; 86 PresentManager present_manager;
81 BlitScreen blit_swapchain; 87 BlitScreen blit_swapchain;
82 BlitScreen blit_screenshot; 88 BlitScreen blit_capture;
83 BlitScreen blit_application_layer; 89 BlitScreen blit_applet;
84 RasterizerVulkan rasterizer; 90 RasterizerVulkan rasterizer;
85 std::optional<TurboMode> turbo_mode; 91 std::optional<TurboMode> turbo_mode;
86 92
87 Frame application_frame; 93 Frame applet_frame;
88}; 94};
89 95
90} // namespace Vulkan 96} // namespace Vulkan