diff options
| author | 2014-04-27 22:21:46 -0700 | |
|---|---|---|
| committer | 2014-04-27 22:21:46 -0700 | |
| commit | ff48c8bed3a7329b57f3889b36492f31e6d44700 (patch) | |
| tree | db1058aa6b4f954957d6e5bb726ff8dcb30018c1 /src/video_core | |
| parent | add missing bswap functions (diff) | |
| download | yuzu-ff48c8bed3a7329b57f3889b36492f31e6d44700.tar.gz yuzu-ff48c8bed3a7329b57f3889b36492f31e6d44700.tar.xz yuzu-ff48c8bed3a7329b57f3889b36492f31e6d44700.zip | |
Rect to BasicRect
Somewhere along the line an OSX header had already taken the name Rect.
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index b63a73d18..314b1a8ed 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp | |||
| @@ -37,7 +37,7 @@ void RendererOpenGL::SwapBuffers() { | |||
| 37 | // EFB->XFB copy | 37 | // EFB->XFB copy |
| 38 | // TODO(bunnei): This is a hack and does not belong here. The copy should be triggered by some | 38 | // TODO(bunnei): This is a hack and does not belong here. The copy should be triggered by some |
| 39 | // register write We're also treating both framebuffers as a single one in OpenGL. | 39 | // register write We're also treating both framebuffers as a single one in OpenGL. |
| 40 | Rect framebuffer_size(0, 0, m_resolution_width, m_resolution_height); | 40 | BasicRect framebuffer_size(0, 0, m_resolution_width, m_resolution_height); |
| 41 | RenderXFB(framebuffer_size, framebuffer_size); | 41 | RenderXFB(framebuffer_size, framebuffer_size); |
| 42 | 42 | ||
| 43 | // XFB->Window copy | 43 | // XFB->Window copy |
| @@ -76,7 +76,7 @@ void RendererOpenGL::FlipFramebuffer(const u8* in, u8* out) { | |||
| 76 | * @param src_rect Source rectangle in XFB to copy | 76 | * @param src_rect Source rectangle in XFB to copy |
| 77 | * @param dst_rect Destination rectangle in output framebuffer to copy to | 77 | * @param dst_rect Destination rectangle in output framebuffer to copy to |
| 78 | */ | 78 | */ |
| 79 | void RendererOpenGL::RenderXFB(const Rect& src_rect, const Rect& dst_rect) { | 79 | void RendererOpenGL::RenderXFB(const BasicRect& src_rect, const BasicRect& dst_rect) { |
| 80 | 80 | ||
| 81 | FlipFramebuffer(LCD::GetFramebufferPointer(LCD::g_regs.framebuffer_top_left_1), m_xfb_top_flipped); | 81 | FlipFramebuffer(LCD::GetFramebufferPointer(LCD::g_regs.framebuffer_top_left_1), m_xfb_top_flipped); |
| 82 | FlipFramebuffer(LCD::GetFramebufferPointer(LCD::g_regs.framebuffer_sub_left_1), m_xfb_bottom_flipped); | 82 | FlipFramebuffer(LCD::GetFramebufferPointer(LCD::g_regs.framebuffer_sub_left_1), m_xfb_bottom_flipped); |
diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h index 4c0b6e59d..cd0480173 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.h +++ b/src/video_core/renderer_opengl/renderer_opengl.h | |||
| @@ -28,7 +28,7 @@ public: | |||
| 28 | * @param src_rect Source rectangle in XFB to copy | 28 | * @param src_rect Source rectangle in XFB to copy |
| 29 | * @param dst_rect Destination rectangle in output framebuffer to copy to | 29 | * @param dst_rect Destination rectangle in output framebuffer to copy to |
| 30 | */ | 30 | */ |
| 31 | void RenderXFB(const Rect& src_rect, const Rect& dst_rect); | 31 | void RenderXFB(const BasicRect& src_rect, const BasicRect& dst_rect); |
| 32 | 32 | ||
| 33 | /** | 33 | /** |
| 34 | * Set the emulator window to use for renderer | 34 | * Set the emulator window to use for renderer |