diff options
| author | bunnei <ericbunnie@gmail.com> | 2014-05-22 22:54:56 -0400 |
|---|---|---|
| committer | bunnei <ericbunnie@gmail.com> | 2014-05-22 22:54:56 -0400 |
| commit | 1de7e8cbe4ee9aab3bc920721a90ef63537771b8 (patch) | |
| tree | 4aae70232dc6d148af003a4d9f1c4f76aff5467b /src/video_core/renderer_opengl/renderer_opengl.h | |
| parent | 9592d61037d05dc53b454644671a441788996208 (diff) | |
| parent | 204c6bfeca2d3bccfe6602699c0b3420f88aaf07 (diff) | |
Merge branch 'master' of https://github.com/bunnei/citra
Diffstat (limited to 'src/video_core/renderer_opengl/renderer_opengl.h')
| -rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h index 4c0b6e59d..dd811cad6 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.h +++ b/src/video_core/renderer_opengl/renderer_opengl.h @@ -28,7 +28,7 @@ public: * @param src_rect Source rectangle in XFB to copy * @param dst_rect Destination rectangle in output framebuffer to copy to */ - void RenderXFB(const Rect& src_rect, const Rect& dst_rect); + void RenderXFB(const common::Rect& src_rect, const common::Rect& dst_rect); /** * Set the emulator window to use for renderer @@ -59,7 +59,7 @@ private: * @param out Pointer to output buffer with flipped framebuffer * @todo Early on hack... I'd like to find a more efficient way of doing this /bunnei */ - void RendererOpenGL::FlipFramebuffer(const u8* in, u8* out); + void FlipFramebuffer(const u8* in, u8* out); EmuWindow* m_render_window; ///< Handle to render window |