From cfd9f7d25b4c1aea49b4dc017990f12142b8302b Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 25 Jan 2022 13:50:10 -0500 Subject: video_core/macro_hle: Return unique_ptr directly from GetHLEProgram() Same behavior, but less code and header dependencies. --- src/video_core/macro/macro_hle.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/video_core/macro/macro_hle.cpp') diff --git a/src/video_core/macro/macro_hle.cpp b/src/video_core/macro/macro_hle.cpp index 3f743ce55..900ad23c9 100644 --- a/src/video_core/macro/macro_hle.cpp +++ b/src/video_core/macro/macro_hle.cpp @@ -105,11 +105,11 @@ private: HLEMacro::HLEMacro(Engines::Maxwell3D& maxwell3d_) : maxwell3d{maxwell3d_} {} HLEMacro::~HLEMacro() = default; -std::optional> HLEMacro::GetHLEProgram(u64 hash) const { +std::unique_ptr HLEMacro::GetHLEProgram(u64 hash) const { const auto it = std::find_if(hle_funcs.cbegin(), hle_funcs.cend(), [hash](const auto& pair) { return pair.first == hash; }); if (it == hle_funcs.end()) { - return std::nullopt; + return nullptr; } return std::make_unique(maxwell3d, it->second); } -- cgit v1.2.3