Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some warning spam

Browse Source
This commit is contained in:
Megamouse
2021-05-29 03:55:41 +02:00
parent 210999b874
commit f18e80e899
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/NP/np_handler.h
+2 -1
View File
@@ -157,7 +157,8 @@ protected:
void GetPingInfoResponse_to_SceNpMatching2SignalingGetPingInfoResponse(const GetPingInfoResponse* resp, SceNpMatching2SignalingGetPingInfoResponse* sce_resp); void GetPingInfoResponse_to_SceNpMatching2SignalingGetPingInfoResponse(const GetPingInfoResponse* resp, SceNpMatching2SignalingGetPingInfoResponse* sce_resp);
void RoomMessageInfo_to_SceNpMatching2RoomMessageInfo(const RoomMessageInfo* mi, SceNpMatching2RoomMessageInfo* sce_mi); void RoomMessageInfo_to_SceNpMatching2RoomMessageInfo(const RoomMessageInfo* mi, SceNpMatching2RoomMessageInfo* sce_mi);
struct callback_info { struct callback_info
{
SceNpMatching2ContextId ctx_id; SceNpMatching2ContextId ctx_id;
vm::ptr<SceNpMatching2RequestCallback> cb; vm::ptr<SceNpMatching2RequestCallback> cb;
vm::ptr<void> cb_arg; vm::ptr<void> cb_arg;
rpcs3/Emu/RSX/GL/GLTextOut.h
+3 -3
View File
@@ -25,7 +25,7 @@ namespace gl
bool initialized = false; bool initialized = false;
bool enabled = false; bool enabled = false;
double m_scale = 1.0; f32 m_scale = 1.0f;
void init_program() void init_program()
{ {
@@ -140,7 +140,7 @@ namespace gl
char *s = const_cast<char *>(text.c_str()); char *s = const_cast<char *>(text.c_str());
//Y is in raster coordinates: convert to bottom-left origin //Y is in raster coordinates: convert to bottom-left origin
y = ((target_h / m_scale) - y - 16); y = (static_cast<int>(target_h / m_scale) - y - 16);
//Compress [0, w] and [0, h] into range [-1, 1] //Compress [0, w] and [0, h] into range [-1, 1]
float scale_x = m_scale * 2.f / target_w; float scale_x = m_scale * 2.f / target_w;
@@ -213,7 +213,7 @@ namespace gl
void set_scale(double scale) void set_scale(double scale)
{ {
// Restrict scale to 2. The dots are gonna be too sparse otherwise. // Restrict scale to 2. The dots are gonna be too sparse otherwise.
m_scale = std::min(scale, 2.0); m_scale = std::min(static_cast<f32>(scale), 2.0f);
} }
}; };
} }
rpcs3/Emu/RSX/VK/VKTextOut.h
+3 -3
View File
@@ -33,7 +33,7 @@ namespace vk
u32 m_uniform_buffer_offset = 0; u32 m_uniform_buffer_offset = 0;
u32 m_uniform_buffer_size = 0; u32 m_uniform_buffer_size = 0;
double m_scale = 1.0; f32 m_scale = 1.0f;
bool initialized = false; bool initialized = false;
std::unordered_map<u8, std::pair<u32, u32>> m_offsets; std::unordered_map<u8, std::pair<u32, u32>> m_offsets;
@@ -295,7 +295,7 @@ namespace vk
char *s = const_cast<char *>(text.c_str()); char *s = const_cast<char *>(text.c_str());
//Y is in raster coordinates: convert to bottom-left origin //Y is in raster coordinates: convert to bottom-left origin
y = ((target_h / m_scale) - y - 16); y = (static_cast<int>(target_h / m_scale) - y - 16);
//Compress [0, w] and [0, h] into range [-1, 1] //Compress [0, w] and [0, h] into range [-1, 1]
//Flip Y scaling //Flip Y scaling
@@ -372,7 +372,7 @@ namespace vk
void set_scale(double scale) void set_scale(double scale)
{ {
// Restrict scale to 2. The dots are gonna be too sparse otherwise. // Restrict scale to 2. The dots are gonna be too sparse otherwise.
m_scale = std::min(scale, 2.0); m_scale = std::min(static_cast<f32>(scale), 2.0f);
} }
}; };
} }