mirror of
https://github.com/citra-emu/citra.git
synced 2024-12-22 15:30:04 +00:00
Merge pull request #2892 from Subv/warnings2
Warnings: Fixed a few missing-return warnings in video_core.
This commit is contained in:
commit
647f017c6d
src/video_core
@ -256,10 +256,9 @@ struct FramebufferRegs {
|
|||||||
return 3;
|
return 3;
|
||||||
case DepthFormat::D24S8:
|
case DepthFormat::D24S8:
|
||||||
return 4;
|
return 4;
|
||||||
default:
|
|
||||||
LOG_CRITICAL(HW_GPU, "Unknown depth format %u", format);
|
|
||||||
UNIMPLEMENTED();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ASSERT_MSG(false, "Unknown depth format %u", format);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Returns the number of bits per depth component of the specified depth format
|
// Returns the number of bits per depth component of the specified depth format
|
||||||
@ -270,10 +269,9 @@ struct FramebufferRegs {
|
|||||||
case DepthFormat::D24:
|
case DepthFormat::D24:
|
||||||
case DepthFormat::D24S8:
|
case DepthFormat::D24S8:
|
||||||
return 24;
|
return 24;
|
||||||
default:
|
|
||||||
LOG_CRITICAL(HW_GPU, "Unknown depth format %u", format);
|
|
||||||
UNIMPLEMENTED();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ASSERT_MSG(false, "Unknown depth format %u", format);
|
||||||
}
|
}
|
||||||
|
|
||||||
INSERT_PADDING_WORDS(0x20);
|
INSERT_PADDING_WORDS(0x20);
|
||||||
|
@ -352,6 +352,8 @@ u8 LogicOp(u8 src, u8 dest, FramebufferRegs::LogicOp op) {
|
|||||||
case FramebufferRegs::LogicOp::OrInverted:
|
case FramebufferRegs::LogicOp::OrInverted:
|
||||||
return ~src | dest;
|
return ~src | dest;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
UNREACHABLE();
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Rasterizer
|
} // namespace Rasterizer
|
||||||
|
@ -89,6 +89,8 @@ Math::Vec3<u8> GetColorModifier(TevStageConfig::ColorModifier factor,
|
|||||||
case ColorModifier::OneMinusSourceBlue:
|
case ColorModifier::OneMinusSourceBlue:
|
||||||
return (Math::Vec3<u8>(255, 255, 255) - values.bbb()).Cast<u8>();
|
return (Math::Vec3<u8>(255, 255, 255) - values.bbb()).Cast<u8>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
UNREACHABLE();
|
||||||
};
|
};
|
||||||
|
|
||||||
u8 GetAlphaModifier(TevStageConfig::AlphaModifier factor, const Math::Vec4<u8>& values) {
|
u8 GetAlphaModifier(TevStageConfig::AlphaModifier factor, const Math::Vec4<u8>& values) {
|
||||||
@ -119,6 +121,8 @@ u8 GetAlphaModifier(TevStageConfig::AlphaModifier factor, const Math::Vec4<u8>&
|
|||||||
case AlphaModifier::OneMinusSourceBlue:
|
case AlphaModifier::OneMinusSourceBlue:
|
||||||
return 255 - values.b();
|
return 255 - values.b();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
UNREACHABLE();
|
||||||
};
|
};
|
||||||
|
|
||||||
Math::Vec3<u8> ColorCombine(TevStageConfig::Operation op, const Math::Vec3<u8> input[3]) {
|
Math::Vec3<u8> ColorCombine(TevStageConfig::Operation op, const Math::Vec3<u8> input[3]) {
|
||||||
|
Loading…
Reference in New Issue
Block a user