mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-20 18:33:24 +02:00
Merge pull request #2469 from Kloen/killing-warnings
Fixing some MSVC warnings
This commit is contained in:
commit
327692ed9d
@ -93,7 +93,7 @@ static void StartSampling(Interface* self) {
|
|||||||
sample_rate = static_cast<SampleRate>(cmd_buff[2] & 0xFF);
|
sample_rate = static_cast<SampleRate>(cmd_buff[2] & 0xFF);
|
||||||
audio_buffer_offset = cmd_buff[3];
|
audio_buffer_offset = cmd_buff[3];
|
||||||
audio_buffer_size = cmd_buff[4];
|
audio_buffer_size = cmd_buff[4];
|
||||||
audio_buffer_loop = static_cast<bool>(cmd_buff[5] & 0xFF);
|
audio_buffer_loop = (cmd_buff[5] & 0xFF) != 0;
|
||||||
|
|
||||||
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
||||||
is_sampling = true;
|
is_sampling = true;
|
||||||
@ -202,7 +202,7 @@ static void GetGain(Interface* self) {
|
|||||||
*/
|
*/
|
||||||
static void SetPower(Interface* self) {
|
static void SetPower(Interface* self) {
|
||||||
u32* cmd_buff = Kernel::GetCommandBuffer();
|
u32* cmd_buff = Kernel::GetCommandBuffer();
|
||||||
mic_power = static_cast<bool>(cmd_buff[1] & 0xFF);
|
mic_power = (cmd_buff[1] & 0xFF) != 0;
|
||||||
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
||||||
LOG_WARNING(Service_MIC, "(STUBBED) called, mic_power=%u", mic_power);
|
LOG_WARNING(Service_MIC, "(STUBBED) called, mic_power=%u", mic_power);
|
||||||
}
|
}
|
||||||
@ -252,7 +252,7 @@ static void SetIirFilterMic(Interface* self) {
|
|||||||
*/
|
*/
|
||||||
static void SetClamp(Interface* self) {
|
static void SetClamp(Interface* self) {
|
||||||
u32* cmd_buff = Kernel::GetCommandBuffer();
|
u32* cmd_buff = Kernel::GetCommandBuffer();
|
||||||
clamp = static_cast<bool>(cmd_buff[1] & 0xFF);
|
clamp = (cmd_buff[1] & 0xFF) != 0;
|
||||||
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
||||||
LOG_WARNING(Service_MIC, "(STUBBED) called, clamp=%u", clamp);
|
LOG_WARNING(Service_MIC, "(STUBBED) called, clamp=%u", clamp);
|
||||||
}
|
}
|
||||||
@ -282,7 +282,7 @@ static void GetClamp(Interface* self) {
|
|||||||
*/
|
*/
|
||||||
static void SetAllowShellClosed(Interface* self) {
|
static void SetAllowShellClosed(Interface* self) {
|
||||||
u32* cmd_buff = Kernel::GetCommandBuffer();
|
u32* cmd_buff = Kernel::GetCommandBuffer();
|
||||||
allow_shell_closed = static_cast<bool>(cmd_buff[1] & 0xFF);
|
allow_shell_closed = (cmd_buff[1] & 0xFF) != 0;
|
||||||
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
||||||
LOG_WARNING(Service_MIC, "(STUBBED) called, allow_shell_closed=%u", allow_shell_closed);
|
LOG_WARNING(Service_MIC, "(STUBBED) called, allow_shell_closed=%u", allow_shell_closed);
|
||||||
}
|
}
|
||||||
|
@ -748,7 +748,8 @@ bool RasterizerOpenGL::AccelerateDisplayTransfer(const GPU::Regs::DisplayTransfe
|
|||||||
|
|
||||||
// Adjust the source rectangle to take into account parts of the input lines being cropped
|
// Adjust the source rectangle to take into account parts of the input lines being cropped
|
||||||
if (config.input_width > config.output_width) {
|
if (config.input_width > config.output_width) {
|
||||||
src_rect.right -= (config.input_width - config.output_width) * src_surface->res_scale_width;
|
src_rect.right -= static_cast<int>((config.input_width - config.output_width) *
|
||||||
|
src_surface->res_scale_width);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Require destination surface to have same resolution scale as source to preserve scaling
|
// Require destination surface to have same resolution scale as source to preserve scaling
|
||||||
|
@ -76,7 +76,7 @@ union PicaShaderConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
state.fog_mode = regs.fog_mode;
|
state.fog_mode = regs.fog_mode;
|
||||||
state.fog_flip = regs.fog_flip;
|
state.fog_flip = regs.fog_flip != 0;
|
||||||
|
|
||||||
state.combiner_buffer_input = regs.tev_combiner_buffer_input.update_mask_rgb.Value() |
|
state.combiner_buffer_input = regs.tev_combiner_buffer_input.update_mask_rgb.Value() |
|
||||||
regs.tev_combiner_buffer_input.update_mask_a.Value() << 4;
|
regs.tev_combiner_buffer_input.update_mask_a.Value() << 4;
|
||||||
|
@ -118,7 +118,7 @@ void ShaderSetup::Run(UnitState& state, const InputVertex& input, int num_attrib
|
|||||||
// Setup input register table
|
// Setup input register table
|
||||||
const auto& attribute_register_map = config.input_register_map;
|
const auto& attribute_register_map = config.input_register_map;
|
||||||
|
|
||||||
for (unsigned i = 0; i < num_attributes; i++)
|
for (int i = 0; i < num_attributes; i++)
|
||||||
state.registers.input[attribute_register_map.GetRegisterForAttribute(i)] = input.attr[i];
|
state.registers.input[attribute_register_map.GetRegisterForAttribute(i)] = input.attr[i];
|
||||||
|
|
||||||
state.conditional_code[0] = false;
|
state.conditional_code[0] = false;
|
||||||
@ -146,7 +146,7 @@ DebugData<true> ShaderSetup::ProduceDebugInfo(const InputVertex& input, int num_
|
|||||||
// Setup input register table
|
// Setup input register table
|
||||||
boost::fill(state.registers.input, Math::Vec4<float24>::AssignToAll(float24::Zero()));
|
boost::fill(state.registers.input, Math::Vec4<float24>::AssignToAll(float24::Zero()));
|
||||||
const auto& attribute_register_map = config.input_register_map;
|
const auto& attribute_register_map = config.input_register_map;
|
||||||
for (unsigned i = 0; i < num_attributes; i++)
|
for (int i = 0; i < num_attributes; i++)
|
||||||
state.registers.input[attribute_register_map.GetRegisterForAttribute(i)] = input.attr[i];
|
state.registers.input[attribute_register_map.GetRegisterForAttribute(i)] = input.attr[i];
|
||||||
|
|
||||||
state.conditional_code[0] = false;
|
state.conditional_code[0] = false;
|
||||||
|
Loading…
Reference in New Issue
Block a user