diff --git a/rpcs3/Emu/Cell/PPUDisAsm.h b/rpcs3/Emu/Cell/PPUDisAsm.h index 3604c98130..075104179f 100644 --- a/rpcs3/Emu/Cell/PPUDisAsm.h +++ b/rpcs3/Emu/Cell/PPUDisAsm.h @@ -11,7 +11,7 @@ public: } private: - u32 DisAsmBranchTarget(const s32 imm) + u32 DisAsmBranchTarget(const s32 imm) override { return dump_pc + (imm & ~3); } diff --git a/rpcs3/Emu/RSX/GL/GLTextureCache.h b/rpcs3/Emu/RSX/GL/GLTextureCache.h index 87c90bfb1b..cd888af0e0 100644 --- a/rpcs3/Emu/RSX/GL/GLTextureCache.h +++ b/rpcs3/Emu/RSX/GL/GLTextureCache.h @@ -672,7 +672,7 @@ namespace gl * Check for sampleable rtts from previous render passes */ gl::render_target *texptr = nullptr; - if (texptr = m_rtts.get_texture_from_render_target_if_applicable(texaddr)) + if ((texptr = m_rtts.get_texture_from_render_target_if_applicable(texaddr))) { for (const auto& tex : m_rtts.m_bound_render_targets) { @@ -703,7 +703,7 @@ namespace gl return; } - if (texptr = m_rtts.get_texture_from_depth_stencil_if_applicable(texaddr)) + if ((texptr = m_rtts.get_texture_from_depth_stencil_if_applicable(texaddr))) { if (texaddr == std::get<0>(m_rtts.m_bound_depth_stencil)) { diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.h b/rpcs3/Emu/RSX/VK/VKHelpers.h index 2fabef671a..9af1e92b64 100644 --- a/rpcs3/Emu/RSX/VK/VKHelpers.h +++ b/rpcs3/Emu/RSX/VK/VKHelpers.h @@ -1091,7 +1091,7 @@ namespace vk m_instance = nullptr; //Check that some critical entry-points have been loaded into memory indicating prescence of a loader - loader_exists = (vkCreateInstance != nullptr); + loader_exists = (&vkCreateInstance != nullptr); } ~context() diff --git a/rpcs3/Emu/RSX/VK/VKTextureCache.h b/rpcs3/Emu/RSX/VK/VKTextureCache.h index 8916187e7c..9fe0bfcfe3 100644 --- a/rpcs3/Emu/RSX/VK/VKTextureCache.h +++ b/rpcs3/Emu/RSX/VK/VKTextureCache.h @@ -578,7 +578,7 @@ namespace vk //First check if it exists as an rtt... vk::render_target *rtt_texture = nullptr; - if (rtt_texture = m_rtts.get_texture_from_render_target_if_applicable(texaddr)) + if ((rtt_texture = m_rtts.get_texture_from_render_target_if_applicable(texaddr))) { if (g_cfg.video.strict_rendering_mode) { @@ -595,7 +595,7 @@ namespace vk return rtt_texture->get_view(); } - if (rtt_texture = m_rtts.get_texture_from_depth_stencil_if_applicable(texaddr)) + if ((rtt_texture = m_rtts.get_texture_from_depth_stencil_if_applicable(texaddr))) { if (g_cfg.video.strict_rendering_mode) {