diff options
| author |  archshift <admin@archshift.com> | 2014-09-07 11:51:10 -0700 |
|---|---|---|
| committer | archshift <admin@archshift.com> | 2014-09-08 15:43:36 -0700 |
| commit | 8fe5f2e2fe33ccde39bc79898052a8f679222964 (patch) | |
| tree | 84b06d77b08b3ef5d67156c5b6e6c588fe7e6c6c /src | |
| parent | 5472fd4d9b19011a36604a9c7f9c66f3ebe84e3f (diff) | |
Moved common_types::Rect from common to Common namespace
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/common_types.h | 2 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/common/common_types.h b/src/common/common_types.h index 9d41e597..00fde828 100644 --- a/src/common/common_types.h +++ b/src/common/common_types.h @@ -100,7 +100,7 @@ union t128 { __m128 a; ///< 128-bit floating point (__m128 maps to the XMM[0-7] registers) }; -namespace common { +namespace Common { /// Rectangle data structure class Rect { public: diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 0e4e0651..ad3ce3ba 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -77,7 +77,7 @@ void RendererOpenGL::SwapBuffers() { // // TODO(princesspeachum): (related to above^) this should only be called when there's new data, not every frame. // Currently this uploads data that shouldn't have changed. - common::Rect framebuffer_size(0, 0, resolution_width, resolution_height); + Common::Rect framebuffer_size(0, 0, resolution_width, resolution_height); RenderXFB(framebuffer_size, framebuffer_size); // XFB->Window copy @@ -113,7 +113,7 @@ void RendererOpenGL::FlipFramebuffer(const u8* raw_data, ScreenInfo& screen_info * @param src_rect Source rectangle in XFB to copy * @param dst_rect Destination rectangle in output framebuffer to copy to */ -void RendererOpenGL::RenderXFB(const common::Rect& src_rect, const common::Rect& dst_rect) { +void RendererOpenGL::RenderXFB(const Common::Rect& src_rect, const Common::Rect& dst_rect) { const auto& framebuffer_top = GPU::g_regs.framebuffer_config[0]; const auto& framebuffer_sub = GPU::g_regs.framebuffer_config[1]; const u32 active_fb_top = (framebuffer_top.active_fb == 1) diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h index eac91df5..0d25b2a5 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.h +++ b/src/video_core/renderer_opengl/renderer_opengl.h @@ -27,7 +27,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 common::Rect& src_rect, const common::Rect& dst_rect); + void RenderXFB(const Common::Rect& src_rect, const Common::Rect& dst_rect); /** * Set the emulator window to use for renderer |