diff options
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/debug_utils/debug_utils.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/hwrasterizer_base.h | 10 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 6 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.h | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp index f1cfa9361..0e29661c7 100644 --- a/src/video_core/debug_utils/debug_utils.cpp +++ b/src/video_core/debug_utils/debug_utils.cpp | |||
| @@ -48,7 +48,7 @@ void DebugContext::OnEvent(Event event, void* data) { | |||
| 48 | 48 | ||
| 49 | if (Settings::values.use_hw_renderer) { | 49 | if (Settings::values.use_hw_renderer) { |
| 50 | // Commit the hardware renderer's framebuffer so it will show on debug widgets | 50 | // Commit the hardware renderer's framebuffer so it will show on debug widgets |
| 51 | VideoCore::g_renderer->hw_rasterizer->CommitFramebuffer(); | 51 | VideoCore::g_renderer->hw_rasterizer->FlushFramebuffer(); |
| 52 | } | 52 | } |
| 53 | 53 | ||
| 54 | // TODO: Should stop the CPU thread here once we multithread emulation. | 54 | // TODO: Should stop the CPU thread here once we multithread emulation. |
diff --git a/src/video_core/hwrasterizer_base.h b/src/video_core/hwrasterizer_base.h index 54b8892fb..b6390950a 100644 --- a/src/video_core/hwrasterizer_base.h +++ b/src/video_core/hwrasterizer_base.h | |||
| @@ -32,14 +32,14 @@ public: | |||
| 32 | virtual void DrawTriangles() = 0; | 32 | virtual void DrawTriangles() = 0; |
| 33 | 33 | ||
| 34 | /// Commit the rasterizer's framebuffer contents immediately to the current 3DS memory framebuffer | 34 | /// Commit the rasterizer's framebuffer contents immediately to the current 3DS memory framebuffer |
| 35 | virtual void CommitFramebuffer() = 0; | 35 | virtual void FlushFramebuffer() = 0; |
| 36 | 36 | ||
| 37 | /// Notify rasterizer that the specified PICA register has been changed | 37 | /// Notify rasterizer that the specified PICA register has been changed |
| 38 | virtual void NotifyPicaRegisterChanged(u32 id) = 0; | 38 | virtual void NotifyPicaRegisterChanged(u32 id) = 0; |
| 39 | 39 | ||
| 40 | /// Notify rasterizer that the specified 3DS memory region will be read from after this notification | 40 | /// Notify rasterizer that any caches of the specified region should be flushed to 3DS memory. |
| 41 | virtual void NotifyPreRead(PAddr addr, u32 size) = 0; | 41 | virtual void FlushRegion(PAddr addr, u32 size) = 0; |
| 42 | 42 | ||
| 43 | /// Notify rasterizer that a 3DS memory region has been changed | 43 | /// Notify rasterizer that any caches of the specified region should be discraded and reloaded from 3DS memory. |
| 44 | virtual void NotifyFlush(PAddr addr, u32 size) = 0; | 44 | virtual void InvalidateRegion(PAddr addr, u32 size) = 0; |
| 45 | }; | 45 | }; |
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index ca8247b86..cc7830688 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -180,7 +180,7 @@ void RasterizerOpenGL::DrawTriangles() { | |||
| 180 | res_cache.InvalidateInRange(cur_fb_depth_addr, cur_fb_depth_size, true); | 180 | res_cache.InvalidateInRange(cur_fb_depth_addr, cur_fb_depth_size, true); |
| 181 | } | 181 | } |
| 182 | 182 | ||
| 183 | void RasterizerOpenGL::CommitFramebuffer() { | 183 | void RasterizerOpenGL::FlushFramebuffer() { |
| 184 | CommitColorBuffer(); | 184 | CommitColorBuffer(); |
| 185 | CommitDepthBuffer(); | 185 | CommitDepthBuffer(); |
| 186 | } | 186 | } |
| @@ -284,7 +284,7 @@ void RasterizerOpenGL::NotifyPicaRegisterChanged(u32 id) { | |||
| 284 | } | 284 | } |
| 285 | } | 285 | } |
| 286 | 286 | ||
| 287 | void RasterizerOpenGL::NotifyPreRead(PAddr addr, u32 size) { | 287 | void RasterizerOpenGL::FlushRegion(PAddr addr, u32 size) { |
| 288 | const auto& regs = Pica::g_state.regs; | 288 | const auto& regs = Pica::g_state.regs; |
| 289 | 289 | ||
| 290 | if (!Settings::values.use_hw_renderer) | 290 | if (!Settings::values.use_hw_renderer) |
| @@ -306,7 +306,7 @@ void RasterizerOpenGL::NotifyPreRead(PAddr addr, u32 size) { | |||
| 306 | CommitDepthBuffer(); | 306 | CommitDepthBuffer(); |
| 307 | } | 307 | } |
| 308 | 308 | ||
| 309 | void RasterizerOpenGL::NotifyFlush(PAddr addr, u32 size) { | 309 | void RasterizerOpenGL::InvalidateRegion(PAddr addr, u32 size) { |
| 310 | const auto& regs = Pica::g_state.regs; | 310 | const auto& regs = Pica::g_state.regs; |
| 311 | 311 | ||
| 312 | if (!Settings::values.use_hw_renderer) | 312 | if (!Settings::values.use_hw_renderer) |
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h index 5ba898189..378cdb65c 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.h +++ b/src/video_core/renderer_opengl/gl_rasterizer.h | |||
| @@ -123,16 +123,16 @@ public: | |||
| 123 | void DrawTriangles() override; | 123 | void DrawTriangles() override; |
| 124 | 124 | ||
| 125 | /// Commit the rasterizer's framebuffer contents immediately to the current 3DS memory framebuffer | 125 | /// Commit the rasterizer's framebuffer contents immediately to the current 3DS memory framebuffer |
| 126 | void CommitFramebuffer() override; | 126 | void FlushFramebuffer() override; |
| 127 | 127 | ||
| 128 | /// Notify rasterizer that the specified PICA register has been changed | 128 | /// Notify rasterizer that the specified PICA register has been changed |
| 129 | void NotifyPicaRegisterChanged(u32 id) override; | 129 | void NotifyPicaRegisterChanged(u32 id) override; |
| 130 | 130 | ||
| 131 | /// Notify rasterizer that the specified 3DS memory region will be read from after this notification | 131 | /// Notify rasterizer that the specified 3DS memory region will be read from after this notification |
| 132 | void NotifyPreRead(PAddr addr, u32 size) override; | 132 | void FlushRegion(PAddr addr, u32 size) override; |
| 133 | 133 | ||
| 134 | /// Notify rasterizer that a 3DS memory region has been changed | 134 | /// Notify rasterizer that a 3DS memory region has been changed |
| 135 | void NotifyFlush(PAddr addr, u32 size) override; | 135 | void InvalidateRegion(PAddr addr, u32 size) override; |
| 136 | 136 | ||
| 137 | /// OpenGL shader generated for a given Pica register state | 137 | /// OpenGL shader generated for a given Pica register state |
| 138 | struct PicaShader { | 138 | struct PicaShader { |