yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

Rect to BasicRect 

Somewhere along the line an OSX header had already taken the name Rect.
This commit is contained in:
archshift 2014-04-27 22:21:46 -07:00
parent 81cb80997a
commit ff48c8bed3
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/common_types.h
View File

@ -101,15 +101,15 @@ union t128 {
}; };
/// Rectangle data structure /// Rectangle data structure
class Rect { class BasicRect {
public: public:
Rect(int x0=0, int y0=0, int x1=0, int y1=0) { BasicRect(int x0=0, int y0=0, int x1=0, int y1=0) {
x0_ = x0; x0_ = x0;
y0_ = y0; y0_ = y0;
x1_ = x1; x1_ = x1;
y1_ = y1; y1_ = y1;
} }
~Rect() { } ~BasicRect() { }
int x0_; ///< Rect top left X-coordinate int x0_; ///< Rect top left X-coordinate
int y0_; ///< Rect top left Y-coordinate int y0_; ///< Rect top left Y-coordinate
@ -119,7 +119,7 @@ public:
inline u32 width() const { return abs(x1_ - x0_); } inline u32 width() const { return abs(x1_ - x0_); }
inline u32 height() const { return abs(y1_ - y0_); } inline u32 height() const { return abs(y1_ - y0_); }
inline bool operator == (const Rect& val) const { inline bool operator == (const BasicRect& val) const {
return (x0_ == val.x0_ && y0_ == val.y0_ && x1_ == val.x1_ && y1_ == val.y1_); return (x0_ == val.x0_ && y0_ == val.y0_ && x1_ == val.x1_ && y1_ == val.y1_);
} }
}; };

4
src/video_core/renderer_opengl/renderer_opengl.cpp
View File

@ -37,7 +37,7 @@ void RendererOpenGL::SwapBuffers() {
// EFB->XFB copy // EFB->XFB copy
// TODO(bunnei): This is a hack and does not belong here. The copy should be triggered by some // TODO(bunnei): This is a hack and does not belong here. The copy should be triggered by some
// register write We're also treating both framebuffers as a single one in OpenGL. // register write We're also treating both framebuffers as a single one in OpenGL.
Rect framebuffer_size(0, 0, m_resolution_width, m_resolution_height); BasicRect framebuffer_size(0, 0, m_resolution_width, m_resolution_height);
RenderXFB(framebuffer_size, framebuffer_size); RenderXFB(framebuffer_size, framebuffer_size);
// XFB->Window copy // XFB->Window copy
@ -76,7 +76,7 @@ void RendererOpenGL::FlipFramebuffer(const u8* in, u8* out) {
* @param src_rect Source rectangle in XFB to copy * @param src_rect Source rectangle in XFB to copy
* @param dst_rect Destination rectangle in output framebuffer to copy to * @param dst_rect Destination rectangle in output framebuffer to copy to
*/ */
void RendererOpenGL::RenderXFB(const Rect& src_rect, const Rect& dst_rect) { void RendererOpenGL::RenderXFB(const BasicRect& src_rect, const BasicRect& dst_rect) {
FlipFramebuffer(LCD::GetFramebufferPointer(LCD::g_regs.framebuffer_top_left_1), m_xfb_top_flipped); FlipFramebuffer(LCD::GetFramebufferPointer(LCD::g_regs.framebuffer_top_left_1), m_xfb_top_flipped);
FlipFramebuffer(LCD::GetFramebufferPointer(LCD::g_regs.framebuffer_sub_left_1), m_xfb_bottom_flipped); FlipFramebuffer(LCD::GetFramebufferPointer(LCD::g_regs.framebuffer_sub_left_1), m_xfb_bottom_flipped);

2
src/video_core/renderer_opengl/renderer_opengl.h
View File

@ -28,7 +28,7 @@ public:
* @param src_rect Source rectangle in XFB to copy * @param src_rect Source rectangle in XFB to copy
* @param dst_rect Destination rectangle in output framebuffer to copy to * @param dst_rect Destination rectangle in output framebuffer to copy to
*/ */
void RenderXFB(const Rect& src_rect, const Rect& dst_rect); void RenderXFB(const BasicRect& src_rect, const BasicRect& dst_rect);
/** /**
* Set the emulator window to use for renderer * Set the emulator window to use for renderer