RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-25 12:12:50 +01:00
Code Issues Releases Wiki Activity

Compilation fix

Browse Source
This commit is contained in:
Nekotekina 2020-02-10 16:57:56 +03:00
parent 6e47a6fb76
commit 034267adb2
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Utilities/geometry.h
View File

@ -101,15 +101,18 @@ struct size2_base
return *this; return *this;
} }
constexpr bool operator == (const size2_base& rhs) const constexpr bool operator ==(const size2_base& rhs) const
{ {
return width == rhs.width && height == rhs.height; return width == rhs.width && height == rhs.height;
} }
constexpr bool operator != (const size2_base& rhs) const #if __cpp_impl_three_way_comparison >= 201711
#else
constexpr bool operator !=(const size2_base& rhs) const
{ {
return width != rhs.width || height != rhs.height; return width != rhs.width || height != rhs.height;
} }
#endif
template<typename NT> template<typename NT>
constexpr operator size2_base<NT>() const constexpr operator size2_base<NT>() const
@ -644,10 +647,13 @@ struct coord_base
return position == rhs.position && size == rhs.size; return position == rhs.position && size == rhs.size;
} }
#if __cpp_impl_three_way_comparison >= 201711
#else
constexpr bool operator != (const coord_base& rhs) const constexpr bool operator != (const coord_base& rhs) const
{ {
return position != rhs.position || size != rhs.size; return position != rhs.position || size != rhs.size;
} }
#endif
template<typename NT> template<typename NT>
constexpr operator coord_base<NT>() const constexpr operator coord_base<NT>() const
@ -876,11 +882,13 @@ struct color4_base
{ {
return r == rhs.r && g == rhs.g && b == rhs.b && a == rhs.a; return r == rhs.r && g == rhs.g && b == rhs.b && a == rhs.a;
} }
#if __cpp_impl_three_way_comparison >= 201711
#else
constexpr bool operator != (const color4_base& rhs) const constexpr bool operator != (const color4_base& rhs) const
{ {
return !(*this == rhs); return !(*this == rhs);
} }
#endif
void operator *= (const color4_base<T>& rhs) void operator *= (const color4_base<T>& rhs)
{ {
@ -950,11 +958,13 @@ struct color3_base
{ {
return r == rhs.r && g == rhs.g && b == rhs.b; return r == rhs.r && g == rhs.g && b == rhs.b;
} }
#if __cpp_impl_three_way_comparison >= 201711
#else
constexpr bool operator != (const color3_base& rhs) const constexpr bool operator != (const color3_base& rhs) const
{ {
return !(*this == rhs); return !(*this == rhs);
} }
#endif
template<typename NT> template<typename NT>
constexpr operator color3_base<NT>() const constexpr operator color3_base<NT>() const
@ -993,10 +1003,13 @@ struct color2_base
return r == rhs.r && g == rhs.g; return r == rhs.r && g == rhs.g;
} }
#if __cpp_impl_three_way_comparison >= 201711
#else
constexpr bool operator != (const color2_base& rhs) const constexpr bool operator != (const color2_base& rhs) const
{ {
return !(*this == rhs); return !(*this == rhs);
} }
#endif
template<typename NT> template<typename NT>
constexpr operator color2_base<NT>() const constexpr operator color2_base<NT>() const
@ -1024,10 +1037,13 @@ struct color1_base
return r == rhs.r; return r == rhs.r;
} }
#if __cpp_impl_three_way_comparison >= 201711
#else
constexpr bool operator != (const color1_base& rhs) const constexpr bool operator != (const color1_base& rhs) const
{ {
return !(*this == rhs); return !(*this == rhs);
} }
#endif
template<typename NT> template<typename NT>
constexpr operator color1_base<NT>() const constexpr operator color1_base<NT>() const

2
rpcs3/Emu/RSX/GL/GLPresent.cpp
View File

@ -66,7 +66,7 @@ GLuint GLGSRender::get_present_source(gl::present_surface_info* info, const rsx:
gl::pixel_unpack_settings unpack_settings; gl::pixel_unpack_settings unpack_settings;
unpack_settings.alignment(1).row_length(info->pitch / 4); unpack_settings.alignment(1).row_length(info->pitch / 4);
if (!m_flip_tex_color || m_flip_tex_color->size2D() != sizei{ static_cast<int>(info->width), static_cast<int>(info->height) }) if (!m_flip_tex_color || m_flip_tex_color->size2D() != sizeu{info->width, info->height})
{ {
m_flip_tex_color = std::make_unique<gl::texture>(GL_TEXTURE_2D, info->width, info->height, 1, 1, GL_RGBA8); m_flip_tex_color = std::make_unique<gl::texture>(GL_TEXTURE_2D, info->width, info->height, 1, 1, GL_RGBA8);
} }