summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar archshift2014-09-07 11:51:10 -0700
committerGravatar archshift2014-09-08 15:43:36 -0700
commit8fe5f2e2fe33ccde39bc79898052a8f679222964 (patch)
tree84b06d77b08b3ef5d67156c5b6e6c588fe7e6c6c /src
parentAdded string_util to common, small changes in loader.cpp (diff)
downloadyuzu-8fe5f2e2fe33ccde39bc79898052a8f679222964.tar.gz
yuzu-8fe5f2e2fe33ccde39bc79898052a8f679222964.tar.xz
yuzu-8fe5f2e2fe33ccde39bc79898052a8f679222964.zip
Moved common_types::Rect from common to Common namespace
Diffstat (limited to 'src')
-rw-r--r--src/common/common_types.h2
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.cpp4
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/common/common_types.h b/src/common/common_types.h
index 9d41e5971..00fde828d 100644
--- a/src/common/common_types.h
+++ b/src/common/common_types.h
@@ -100,7 +100,7 @@ union t128 {
100 __m128 a; ///< 128-bit floating point (__m128 maps to the XMM[0-7] registers) 100 __m128 a; ///< 128-bit floating point (__m128 maps to the XMM[0-7] registers)
101}; 101};
102 102
103namespace common { 103namespace Common {
104/// Rectangle data structure 104/// Rectangle data structure
105class Rect { 105class Rect {
106public: 106public:
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp
index 0e4e06517..ad3ce3ba1 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() {
77 // 77 //
78 // TODO(princesspeachum): (related to above^) this should only be called when there's new data, not every frame. 78 // TODO(princesspeachum): (related to above^) this should only be called when there's new data, not every frame.
79 // Currently this uploads data that shouldn't have changed. 79 // Currently this uploads data that shouldn't have changed.
80 common::Rect framebuffer_size(0, 0, resolution_width, resolution_height); 80 Common::Rect framebuffer_size(0, 0, resolution_width, resolution_height);
81 RenderXFB(framebuffer_size, framebuffer_size); 81 RenderXFB(framebuffer_size, framebuffer_size);
82 82
83 // XFB->Window copy 83 // XFB->Window copy
@@ -113,7 +113,7 @@ void RendererOpenGL::FlipFramebuffer(const u8* raw_data, ScreenInfo& screen_info
113 * @param src_rect Source rectangle in XFB to copy 113 * @param src_rect Source rectangle in XFB to copy
114 * @param dst_rect Destination rectangle in output framebuffer to copy to 114 * @param dst_rect Destination rectangle in output framebuffer to copy to
115 */ 115 */
116void RendererOpenGL::RenderXFB(const common::Rect& src_rect, const common::Rect& dst_rect) { 116void RendererOpenGL::RenderXFB(const Common::Rect& src_rect, const Common::Rect& dst_rect) {
117 const auto& framebuffer_top = GPU::g_regs.framebuffer_config[0]; 117 const auto& framebuffer_top = GPU::g_regs.framebuffer_config[0];
118 const auto& framebuffer_sub = GPU::g_regs.framebuffer_config[1]; 118 const auto& framebuffer_sub = GPU::g_regs.framebuffer_config[1];
119 const u32 active_fb_top = (framebuffer_top.active_fb == 1) 119 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 eac91df51..0d25b2a52 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.h
+++ b/src/video_core/renderer_opengl/renderer_opengl.h
@@ -27,7 +27,7 @@ public:
27 * @param src_rect Source rectangle in XFB to copy 27 * @param src_rect Source rectangle in XFB to copy
28 * @param dst_rect Destination rectangle in output framebuffer to copy to 28 * @param dst_rect Destination rectangle in output framebuffer to copy to
29 */ 29 */
30 void RenderXFB(const common::Rect& src_rect, const common::Rect& dst_rect); 30 void RenderXFB(const Common::Rect& src_rect, const Common::Rect& dst_rect);
31 31
32 /** 32 /**
33 * Set the emulator window to use for renderer 33 * Set the emulator window to use for renderer