diff --git a/rpcs3/Emu/Cell/lv2/sys_rsx.cpp b/rpcs3/Emu/Cell/lv2/sys_rsx.cpp index 9dd49d15f1..d7ec048136 100644 --- a/rpcs3/Emu/Cell/lv2/sys_rsx.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_rsx.cpp @@ -191,13 +191,15 @@ error_code sys_rsx_memory_allocate(cpu_thread& cpu, vm::ptr mem_handle, vm: cpu.state += cpu_flag::wait; - if (vm::falloc(rsx::constants::local_mem_base, size, vm::video)) + const u32 mem_size = static_cast(size); + + if (vm::falloc(rsx::constants::local_mem_base, mem_size, vm::video)) { - rsx::get_current_renderer()->local_mem_size = size; + rsx::get_current_renderer()->local_mem_size = mem_size; if (u32 addr = rsx::get_current_renderer()->driver_info) { - vm::_ptr(addr)->memory_size = size; + vm::_ptr(addr)->memory_size = mem_size; } *mem_addr = rsx::constants::local_mem_base; @@ -435,7 +437,7 @@ error_code sys_rsx_context_iomap(cpu_thread& cpu, u32 context_id, u64 io, u64 ea } // Wait until we have no active RSX locks and reserve iomap for use. Must do so before acquiring vm lock to avoid deadlocks - rsx::reservation_lock rsx_lock(ea, size); + rsx::reservation_lock rsx_lock(::narrow(ea), static_cast(size)); vm::writer_lock rlock; @@ -446,7 +448,7 @@ error_code sys_rsx_context_iomap(cpu_thread& cpu, u32 context_id, u64 io, u64 ea return CELL_EINVAL; } - if ((addr == ea || !(addr % 0x1000'0000)) && idm::check_unlocked(sys_vm_t::find_id(addr))) + if ((addr == ea || !(addr % 0x1000'0000)) && idm::check_unlocked(sys_vm_t::find_id(::narrow(addr)))) { // Virtual memory is disallowed return CELL_EINVAL; diff --git a/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp b/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp index 73950ec433..7f1d1b97ea 100644 --- a/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp +++ b/rpcs3/Emu/RSX/GL/GLShaderInterpreter.cpp @@ -295,7 +295,7 @@ namespace gl } } - u32 len; + u32 len {}; ParamArray arr; std::string shader_str; RSXFragmentProgram frag; diff --git a/rpcs3/Emu/RSX/Program/program_util.h b/rpcs3/Emu/RSX/Program/program_util.h index 8159b27845..9b721c088d 100644 --- a/rpcs3/Emu/RSX/Program/program_util.h +++ b/rpcs3/Emu/RSX/Program/program_util.h @@ -16,14 +16,14 @@ namespace rsx { struct TIU_slot { - float scale[3]; - float bias[3]; - float clamp_min[2]; - float clamp_max[2]; - u32 remap; - u32 control; + float scale[3] {}; + float bias[3] {}; + float clamp_min[2] {}; + float clamp_max[2] {}; + u32 remap {}; + u32 control {}; } - slots_[16]; // QT headers will collide with any variable named 'slots' because reasons + slots_[16] {}; // QT headers will collide with any variable named 'slots' because reasons TIU_slot& operator[](u32 index) { return slots_[index]; }