From 609e32e317bee3200e2940122a4f16bd4406d997 Mon Sep 17 00:00:00 2001 From: emufan4568 Date: Tue, 9 Aug 2022 20:34:15 +0300 Subject: [PATCH] rasterizer: Use std::ranges::transform everywhere --- src/video_core/common/rasterizer.cpp | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/src/video_core/common/rasterizer.cpp b/src/video_core/common/rasterizer.cpp index 502b12693..ea0ef1d9b 100644 --- a/src/video_core/common/rasterizer.cpp +++ b/src/video_core/common/rasterizer.cpp @@ -1890,10 +1890,9 @@ void Rasterizer::SyncAndUploadLUTsLF() { if (uniform_block_data.fog_lut_dirty || invalidate) { std::array new_data; - std::transform(Pica::g_state.fog.lut.begin(), Pica::g_state.fog.lut.end(), new_data.begin(), - [](const auto& entry) { - return Common::Vec2f{entry.ToFloat(), entry.DiffToFloat()}; - }); + std::ranges::transform(Pica::g_state.fog.lut, new_data.begin(), [](const auto& entry) { + return Common::Vec2f{entry.ToFloat(), entry.DiffToFloat()}; + }); if (new_data != fog_lut_data || invalidate) { fog_lut_data = new_data; @@ -1969,12 +1968,10 @@ void Rasterizer::SyncAndUploadLUTs() { if (uniform_block_data.proctex_lut_dirty || invalidate) { std::array new_data; - std::transform(Pica::g_state.proctex.color_table.begin(), - Pica::g_state.proctex.color_table.end(), new_data.begin(), - [](const auto& entry) { - auto rgba = entry.ToVector() / 255.0f; - return Common::Vec4f{rgba.r(), rgba.g(), rgba.b(), rgba.a()}; - }); + std::ranges::transform(Pica::g_state.proctex.color_table, new_data.begin(), [](const auto& entry) { + auto rgba = entry.ToVector() / 255.0f; + return Common::Vec4f{rgba.r(), rgba.g(), rgba.b(), rgba.a()}; + }); if (new_data != proctex_lut_data || invalidate) { proctex_lut_data = new_data; @@ -1984,6 +1981,7 @@ void Rasterizer::SyncAndUploadLUTs() { uniform_block_data.dirty = true; bytes_used += new_data.size() * sizeof(Common::Vec4f); } + uniform_block_data.proctex_lut_dirty = false; } @@ -1991,12 +1989,10 @@ void Rasterizer::SyncAndUploadLUTs() { if (uniform_block_data.proctex_diff_lut_dirty || invalidate) { std::array new_data; - std::transform(Pica::g_state.proctex.color_diff_table.begin(), - Pica::g_state.proctex.color_diff_table.end(), new_data.begin(), - [](const auto& entry) { - auto rgba = entry.ToVector() / 255.0f; - return Common::Vec4f{rgba.r(), rgba.g(), rgba.b(), rgba.a()}; - }); + std::ranges::transform(Pica::g_state.proctex.color_diff_table, new_data.begin(), [](const auto& entry) { + auto rgba = entry.ToVector() / 255.0f; + return Common::Vec4f{rgba.r(), rgba.g(), rgba.b(), rgba.a()}; + }); if (new_data != proctex_diff_lut_data || invalidate) { proctex_diff_lut_data = new_data;