Silence some obvious warnings

Makes travis logs a bit cleaner
This commit is contained in:
Danila Malyutin 2017-08-17 00:56:29 +03:00 committed by Ivan
parent dc9671c639
commit 9d1aebce74
4 changed files with 6 additions and 6 deletions

View File

@ -11,7 +11,7 @@ public:
}
private:
u32 DisAsmBranchTarget(const s32 imm)
u32 DisAsmBranchTarget(const s32 imm) override
{
return dump_pc + (imm & ~3);
}

View File

@ -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))
{

View File

@ -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()

View File

@ -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)
{