summaryrefslogtreecommitdiff
path: root/src/video_core/renderer_opengl
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_opengl
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_opengl')
-rw-r--r--src/video_core/renderer_opengl/gl_blit_screen.cpp4
-rw-r--r--src/video_core/renderer_opengl/gl_blit_screen.h2
-rw-r--r--src/video_core/renderer_opengl/present/layer.cpp15
-rw-r--r--src/video_core/renderer_opengl/present/layer.h2
-rw-r--r--src/video_core/renderer_opengl/present/window_adapt_pass.cpp4
-rw-r--r--src/video_core/renderer_opengl/present/window_adapt_pass.h2
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.cpp85
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.h9
8 files changed, 100 insertions, 23 deletions
diff --git a/src/video_core/renderer_opengl/gl_blit_screen.cpp b/src/video_core/renderer_opengl/gl_blit_screen.cpp
index 6ba8b214b..0282905ee 100644
--- a/src/video_core/renderer_opengl/gl_blit_screen.cpp
+++ b/src/video_core/renderer_opengl/gl_blit_screen.cpp
@@ -20,7 +20,7 @@ BlitScreen::BlitScreen(RasterizerOpenGL& rasterizer_,
20BlitScreen::~BlitScreen() = default; 20BlitScreen::~BlitScreen() = default;
21 21
22void BlitScreen::DrawScreen(std::span<const Tegra::FramebufferConfig> framebuffers, 22void BlitScreen::DrawScreen(std::span<const Tegra::FramebufferConfig> framebuffers,
23 const Layout::FramebufferLayout& layout) { 23 const Layout::FramebufferLayout& layout, bool invert_y) {
24 // TODO: Signal state tracker about these changes 24 // TODO: Signal state tracker about these changes
25 state_tracker.NotifyScreenDrawVertexArray(); 25 state_tracker.NotifyScreenDrawVertexArray();
26 state_tracker.NotifyPolygonModes(); 26 state_tracker.NotifyPolygonModes();
@@ -60,7 +60,7 @@ void BlitScreen::DrawScreen(std::span<const Tegra::FramebufferConfig> framebuffe
60 } 60 }
61 61
62 CreateWindowAdapt(); 62 CreateWindowAdapt();
63 window_adapt->DrawToFramebuffer(program_manager, layers, framebuffers, layout); 63 window_adapt->DrawToFramebuffer(program_manager, layers, framebuffers, layout, invert_y);
64 64
65 // TODO 65 // TODO
66 // program_manager.RestoreGuestPipeline(); 66 // program_manager.RestoreGuestPipeline();
diff --git a/src/video_core/renderer_opengl/gl_blit_screen.h b/src/video_core/renderer_opengl/gl_blit_screen.h
index 0c3d838f1..4e261d333 100644
--- a/src/video_core/renderer_opengl/gl_blit_screen.h
+++ b/src/video_core/renderer_opengl/gl_blit_screen.h
@@ -51,7 +51,7 @@ public:
51 51
52 /// Draws the emulated screens to the emulator window. 52 /// Draws the emulated screens to the emulator window.
53 void DrawScreen(std::span<const Tegra::FramebufferConfig> framebuffers, 53 void DrawScreen(std::span<const Tegra::FramebufferConfig> framebuffers,
54 const Layout::FramebufferLayout& layout); 54 const Layout::FramebufferLayout& layout, bool invert_y);
55 55
56private: 56private:
57 void CreateWindowAdapt(); 57 void CreateWindowAdapt();
diff --git a/src/video_core/renderer_opengl/present/layer.cpp b/src/video_core/renderer_opengl/present/layer.cpp
index e3fffaa06..3e4377db4 100644
--- a/src/video_core/renderer_opengl/present/layer.cpp
+++ b/src/video_core/renderer_opengl/present/layer.cpp
@@ -34,7 +34,7 @@ GLuint Layer::ConfigureDraw(std::array<GLfloat, 3 * 2>& out_matrix,
34 std::array<ScreenRectVertex, 4>& out_vertices, 34 std::array<ScreenRectVertex, 4>& out_vertices,
35 ProgramManager& program_manager, 35 ProgramManager& program_manager,
36 const Tegra::FramebufferConfig& framebuffer, 36 const Tegra::FramebufferConfig& framebuffer,
37 const Layout::FramebufferLayout& layout) { 37 const Layout::FramebufferLayout& layout, bool invert_y) {
38 FramebufferTextureInfo info = PrepareRenderTarget(framebuffer); 38 FramebufferTextureInfo info = PrepareRenderTarget(framebuffer);
39 auto crop = Tegra::NormalizeCrop(framebuffer, info.width, info.height); 39 auto crop = Tegra::NormalizeCrop(framebuffer, info.width, info.height);
40 GLuint texture = info.display_texture; 40 GLuint texture = info.display_texture;
@@ -83,10 +83,15 @@ GLuint Layer::ConfigureDraw(std::array<GLfloat, 3 * 2>& out_matrix,
83 const auto w = screen.GetWidth(); 83 const auto w = screen.GetWidth();
84 const auto h = screen.GetHeight(); 84 const auto h = screen.GetHeight();
85 85
86 out_vertices[0] = ScreenRectVertex(x, y, crop.left, crop.top); 86 const auto left = crop.left;
87 out_vertices[1] = ScreenRectVertex(x + w, y, crop.right, crop.top); 87 const auto right = crop.right;
88 out_vertices[2] = ScreenRectVertex(x, y + h, crop.left, crop.bottom); 88 const auto top = invert_y ? crop.bottom : crop.top;
89 out_vertices[3] = ScreenRectVertex(x + w, y + h, crop.right, crop.bottom); 89 const auto bottom = invert_y ? crop.top : crop.bottom;
90
91 out_vertices[0] = ScreenRectVertex(x, y, left, top);
92 out_vertices[1] = ScreenRectVertex(x + w, y, right, top);
93 out_vertices[2] = ScreenRectVertex(x, y + h, left, bottom);
94 out_vertices[3] = ScreenRectVertex(x + w, y + h, right, bottom);
90 95
91 return texture; 96 return texture;
92} 97}
diff --git a/src/video_core/renderer_opengl/present/layer.h b/src/video_core/renderer_opengl/present/layer.h
index ef1055abf..77bb97f4f 100644
--- a/src/video_core/renderer_opengl/present/layer.h
+++ b/src/video_core/renderer_opengl/present/layer.h
@@ -51,7 +51,7 @@ public:
51 std::array<ScreenRectVertex, 4>& out_vertices, 51 std::array<ScreenRectVertex, 4>& out_vertices,
52 ProgramManager& program_manager, 52 ProgramManager& program_manager,
53 const Tegra::FramebufferConfig& framebuffer, 53 const Tegra::FramebufferConfig& framebuffer,
54 const Layout::FramebufferLayout& layout); 54 const Layout::FramebufferLayout& layout, bool invert_y);
55 55
56private: 56private:
57 /// Loads framebuffer from emulated memory into the active OpenGL texture. 57 /// Loads framebuffer from emulated memory into the active OpenGL texture.
diff --git a/src/video_core/renderer_opengl/present/window_adapt_pass.cpp b/src/video_core/renderer_opengl/present/window_adapt_pass.cpp
index 0328abd70..d8b6a11cb 100644
--- a/src/video_core/renderer_opengl/present/window_adapt_pass.cpp
+++ b/src/video_core/renderer_opengl/present/window_adapt_pass.cpp
@@ -37,7 +37,7 @@ WindowAdaptPass::~WindowAdaptPass() = default;
37 37
38void WindowAdaptPass::DrawToFramebuffer(ProgramManager& program_manager, std::list<Layer>& layers, 38void WindowAdaptPass::DrawToFramebuffer(ProgramManager& program_manager, std::list<Layer>& layers,
39 std::span<const Tegra::FramebufferConfig> framebuffers, 39 std::span<const Tegra::FramebufferConfig> framebuffers,
40 const Layout::FramebufferLayout& layout) { 40 const Layout::FramebufferLayout& layout, bool invert_y) {
41 GLint old_read_fb; 41 GLint old_read_fb;
42 GLint old_draw_fb; 42 GLint old_draw_fb;
43 glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &old_read_fb); 43 glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &old_read_fb);
@@ -51,7 +51,7 @@ void WindowAdaptPass::DrawToFramebuffer(ProgramManager& program_manager, std::li
51 auto layer_it = layers.begin(); 51 auto layer_it = layers.begin();
52 for (size_t i = 0; i < layer_count; i++) { 52 for (size_t i = 0; i < layer_count; i++) {
53 textures[i] = layer_it->ConfigureDraw(matrices[i], vertices[i], program_manager, 53 textures[i] = layer_it->ConfigureDraw(matrices[i], vertices[i], program_manager,
54 framebuffers[i], layout); 54 framebuffers[i], layout, invert_y);
55 layer_it++; 55 layer_it++;
56 } 56 }
57 57
diff --git a/src/video_core/renderer_opengl/present/window_adapt_pass.h b/src/video_core/renderer_opengl/present/window_adapt_pass.h
index 00975a9c6..0a8bcef2f 100644
--- a/src/video_core/renderer_opengl/present/window_adapt_pass.h
+++ b/src/video_core/renderer_opengl/present/window_adapt_pass.h
@@ -31,7 +31,7 @@ public:
31 31
32 void DrawToFramebuffer(ProgramManager& program_manager, std::list<Layer>& layers, 32 void DrawToFramebuffer(ProgramManager& program_manager, std::list<Layer>& layers,
33 std::span<const Tegra::FramebufferConfig> framebuffers, 33 std::span<const Tegra::FramebufferConfig> framebuffers,
34 const Layout::FramebufferLayout& layout); 34 const Layout::FramebufferLayout& layout, bool invert_y);
35 35
36private: 36private:
37 const Device& device; 37 const Device& device;
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp
index e33a32592..a1a8491e5 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.cpp
+++ b/src/video_core/renderer_opengl/renderer_opengl.cpp
@@ -16,6 +16,7 @@
16#include "core/core_timing.h" 16#include "core/core_timing.h"
17#include "core/frontend/emu_window.h" 17#include "core/frontend/emu_window.h"
18#include "core/telemetry_session.h" 18#include "core/telemetry_session.h"
19#include "video_core/capture.h"
19#include "video_core/renderer_opengl/gl_blit_screen.h" 20#include "video_core/renderer_opengl/gl_blit_screen.h"
20#include "video_core/renderer_opengl/gl_rasterizer.h" 21#include "video_core/renderer_opengl/gl_rasterizer.h"
21#include "video_core/renderer_opengl/gl_shader_manager.h" 22#include "video_core/renderer_opengl/gl_shader_manager.h"
@@ -121,6 +122,13 @@ RendererOpenGL::RendererOpenGL(Core::TelemetrySession& telemetry_session_,
121 } 122 }
122 blit_screen = std::make_unique<BlitScreen>(rasterizer, device_memory, state_tracker, 123 blit_screen = std::make_unique<BlitScreen>(rasterizer, device_memory, state_tracker,
123 program_manager, device); 124 program_manager, device);
125 blit_applet = std::make_unique<BlitScreen>(rasterizer, device_memory, state_tracker,
126 program_manager, device);
127 capture_framebuffer.Create();
128 capture_renderbuffer.Create();
129 glBindRenderbuffer(GL_RENDERBUFFER, capture_renderbuffer.handle);
130 glRenderbufferStorage(GL_RENDERBUFFER, GL_SRGB8, VideoCore::Capture::LinearWidth,
131 VideoCore::Capture::LinearHeight);
124} 132}
125 133
126RendererOpenGL::~RendererOpenGL() = default; 134RendererOpenGL::~RendererOpenGL() = default;
@@ -130,10 +138,11 @@ void RendererOpenGL::Composite(std::span<const Tegra::FramebufferConfig> framebu
130 return; 138 return;
131 } 139 }
132 140
141 RenderAppletCaptureLayer(framebuffers);
133 RenderScreenshot(framebuffers); 142 RenderScreenshot(framebuffers);
134 143
135 state_tracker.BindFramebuffer(0); 144 state_tracker.BindFramebuffer(0);
136 blit_screen->DrawScreen(framebuffers, emu_window.GetFramebufferLayout()); 145 blit_screen->DrawScreen(framebuffers, emu_window.GetFramebufferLayout(), false);
137 146
138 ++m_current_frame; 147 ++m_current_frame;
139 148
@@ -159,11 +168,8 @@ void RendererOpenGL::AddTelemetryFields() {
159 telemetry_session.AddField(user_system, "GPU_OpenGL_Version", std::string(gl_version)); 168 telemetry_session.AddField(user_system, "GPU_OpenGL_Version", std::string(gl_version));
160} 169}
161 170
162void RendererOpenGL::RenderScreenshot(std::span<const Tegra::FramebufferConfig> framebuffers) { 171void RendererOpenGL::RenderToBuffer(std::span<const Tegra::FramebufferConfig> framebuffers,
163 if (!renderer_settings.screenshot_requested) { 172 const Layout::FramebufferLayout& layout, void* dst) {
164 return;
165 }
166
167 GLint old_read_fb; 173 GLint old_read_fb;
168 GLint old_draw_fb; 174 GLint old_draw_fb;
169 glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &old_read_fb); 175 glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &old_read_fb);
@@ -173,29 +179,86 @@ void RendererOpenGL::RenderScreenshot(std::span<const Tegra::FramebufferConfig>
173 screenshot_framebuffer.Create(); 179 screenshot_framebuffer.Create();
174 glBindFramebuffer(GL_FRAMEBUFFER, screenshot_framebuffer.handle); 180 glBindFramebuffer(GL_FRAMEBUFFER, screenshot_framebuffer.handle);
175 181
176 const Layout::FramebufferLayout layout{renderer_settings.screenshot_framebuffer_layout};
177
178 GLuint renderbuffer; 182 GLuint renderbuffer;
179 glGenRenderbuffers(1, &renderbuffer); 183 glGenRenderbuffers(1, &renderbuffer);
180 glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer); 184 glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer);
181 glRenderbufferStorage(GL_RENDERBUFFER, GL_SRGB8, layout.width, layout.height); 185 glRenderbufferStorage(GL_RENDERBUFFER, GL_SRGB8, layout.width, layout.height);
182 glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, renderbuffer); 186 glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, renderbuffer);
183 187
184 blit_screen->DrawScreen(framebuffers, layout); 188 blit_screen->DrawScreen(framebuffers, layout, false);
185 189
186 glBindBuffer(GL_PIXEL_PACK_BUFFER, 0); 190 glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
187 glPixelStorei(GL_PACK_ROW_LENGTH, 0); 191 glPixelStorei(GL_PACK_ROW_LENGTH, 0);
188 glReadPixels(0, 0, layout.width, layout.height, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 192 glReadPixels(0, 0, layout.width, layout.height, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, dst);
189 renderer_settings.screenshot_bits);
190 193
191 screenshot_framebuffer.Release(); 194 screenshot_framebuffer.Release();
192 glDeleteRenderbuffers(1, &renderbuffer); 195 glDeleteRenderbuffers(1, &renderbuffer);
193 196
194 glBindFramebuffer(GL_READ_FRAMEBUFFER, old_read_fb); 197 glBindFramebuffer(GL_READ_FRAMEBUFFER, old_read_fb);
195 glBindFramebuffer(GL_DRAW_FRAMEBUFFER, old_draw_fb); 198 glBindFramebuffer(GL_DRAW_FRAMEBUFFER, old_draw_fb);
199}
200
201void RendererOpenGL::RenderScreenshot(std::span<const Tegra::FramebufferConfig> framebuffers) {
202 if (!renderer_settings.screenshot_requested) {
203 return;
204 }
205
206 RenderToBuffer(framebuffers, renderer_settings.screenshot_framebuffer_layout,
207 renderer_settings.screenshot_bits);
196 208
197 renderer_settings.screenshot_complete_callback(true); 209 renderer_settings.screenshot_complete_callback(true);
198 renderer_settings.screenshot_requested = false; 210 renderer_settings.screenshot_requested = false;
199} 211}
200 212
213void RendererOpenGL::RenderAppletCaptureLayer(
214 std::span<const Tegra::FramebufferConfig> framebuffers) {
215 GLint old_read_fb;
216 GLint old_draw_fb;
217 glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &old_read_fb);
218 glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &old_draw_fb);
219
220 glBindFramebuffer(GL_FRAMEBUFFER, capture_framebuffer.handle);
221 glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,
222 capture_renderbuffer.handle);
223
224 blit_applet->DrawScreen(framebuffers, VideoCore::Capture::Layout, true);
225
226 glBindFramebuffer(GL_READ_FRAMEBUFFER, old_read_fb);
227 glBindFramebuffer(GL_DRAW_FRAMEBUFFER, old_draw_fb);
228}
229
230std::vector<u8> RendererOpenGL::GetAppletCaptureBuffer() {
231 using namespace VideoCore::Capture;
232
233 std::vector<u8> linear(TiledSize);
234 std::vector<u8> out(TiledSize);
235
236 GLint old_read_fb;
237 GLint old_draw_fb;
238 GLint old_pixel_pack_buffer;
239 GLint old_pack_row_length;
240 glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &old_read_fb);
241 glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &old_draw_fb);
242 glGetIntegerv(GL_PIXEL_PACK_BUFFER_BINDING, &old_pixel_pack_buffer);
243 glGetIntegerv(GL_PACK_ROW_LENGTH, &old_pack_row_length);
244
245 glBindFramebuffer(GL_FRAMEBUFFER, capture_framebuffer.handle);
246 glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER,
247 capture_renderbuffer.handle);
248 glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
249 glPixelStorei(GL_PACK_ROW_LENGTH, 0);
250 glReadPixels(0, 0, LinearWidth, LinearHeight, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV,
251 linear.data());
252
253 glBindFramebuffer(GL_READ_FRAMEBUFFER, old_read_fb);
254 glBindFramebuffer(GL_DRAW_FRAMEBUFFER, old_draw_fb);
255 glBindBuffer(GL_PIXEL_PACK_BUFFER, old_pixel_pack_buffer);
256 glPixelStorei(GL_PACK_ROW_LENGTH, old_pack_row_length);
257
258 Tegra::Texture::SwizzleTexture(out, linear, BytesPerPixel, LinearWidth, LinearHeight,
259 LinearDepth, BlockHeight, BlockDepth);
260
261 return out;
262}
263
201} // namespace OpenGL 264} // namespace OpenGL
diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h
index c4625c96e..60d6a1477 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.h
+++ b/src/video_core/renderer_opengl/renderer_opengl.h
@@ -42,6 +42,8 @@ public:
42 42
43 void Composite(std::span<const Tegra::FramebufferConfig> framebuffers) override; 43 void Composite(std::span<const Tegra::FramebufferConfig> framebuffers) override;
44 44
45 std::vector<u8> GetAppletCaptureBuffer() override;
46
45 VideoCore::RasterizerInterface* ReadRasterizer() override { 47 VideoCore::RasterizerInterface* ReadRasterizer() override {
46 return &rasterizer; 48 return &rasterizer;
47 } 49 }
@@ -52,7 +54,11 @@ public:
52 54
53private: 55private:
54 void AddTelemetryFields(); 56 void AddTelemetryFields();
57
58 void RenderToBuffer(std::span<const Tegra::FramebufferConfig> framebuffers,
59 const Layout::FramebufferLayout& layout, void* dst);
55 void RenderScreenshot(std::span<const Tegra::FramebufferConfig> framebuffers); 60 void RenderScreenshot(std::span<const Tegra::FramebufferConfig> framebuffers);
61 void RenderAppletCaptureLayer(std::span<const Tegra::FramebufferConfig> framebuffers);
56 62
57 Core::TelemetrySession& telemetry_session; 63 Core::TelemetrySession& telemetry_session;
58 Core::Frontend::EmuWindow& emu_window; 64 Core::Frontend::EmuWindow& emu_window;
@@ -64,8 +70,11 @@ private:
64 ProgramManager program_manager; 70 ProgramManager program_manager;
65 RasterizerOpenGL rasterizer; 71 RasterizerOpenGL rasterizer;
66 OGLFramebuffer screenshot_framebuffer; 72 OGLFramebuffer screenshot_framebuffer;
73 OGLFramebuffer capture_framebuffer;
74 OGLRenderbuffer capture_renderbuffer;
67 75
68 std::unique_ptr<BlitScreen> blit_screen; 76 std::unique_ptr<BlitScreen> blit_screen;
77 std::unique_ptr<BlitScreen> blit_applet;
69}; 78};
70 79
71} // namespace OpenGL 80} // namespace OpenGL