octo/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rasterizer: Use std::ranges::transform everywhere

Browse Source
This commit is contained in:
emufan4568
2022-08-09 20:34:15 +03:00
parent 2397c82b85
commit 609e32e317
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/video_core/common/rasterizer.cpp
View File

@@ -1890,8 +1890,7 @@ void Rasterizer::SyncAndUploadLUTsLF() {
if (uniform_block_data.fog_lut_dirty || invalidate) { if (uniform_block_data.fog_lut_dirty || invalidate) {
std::array<Common::Vec2f, 128> new_data; std::array<Common::Vec2f, 128> new_data;
std::transform(Pica::g_state.fog.lut.begin(), Pica::g_state.fog.lut.end(), new_data.begin(), std::ranges::transform(Pica::g_state.fog.lut, new_data.begin(), [](const auto& entry) {
[](const auto& entry) {
return Common::Vec2f{entry.ToFloat(), entry.DiffToFloat()}; return Common::Vec2f{entry.ToFloat(), entry.DiffToFloat()};
}); });
@@ -1969,9 +1968,7 @@ void Rasterizer::SyncAndUploadLUTs() {
if (uniform_block_data.proctex_lut_dirty || invalidate) { if (uniform_block_data.proctex_lut_dirty || invalidate) {
std::array<Common::Vec4f, 256> new_data; std::array<Common::Vec4f, 256> new_data;
std::transform(Pica::g_state.proctex.color_table.begin(), std::ranges::transform(Pica::g_state.proctex.color_table, new_data.begin(), [](const auto& entry) {
Pica::g_state.proctex.color_table.end(), new_data.begin(),
[](const auto& entry) {
auto rgba = entry.ToVector() / 255.0f; auto rgba = entry.ToVector() / 255.0f;
return Common::Vec4f{rgba.r(), rgba.g(), rgba.b(), rgba.a()}; return Common::Vec4f{rgba.r(), rgba.g(), rgba.b(), rgba.a()};
}); });
@@ -1984,6 +1981,7 @@ void Rasterizer::SyncAndUploadLUTs() {
uniform_block_data.dirty = true; uniform_block_data.dirty = true;
bytes_used += new_data.size() * sizeof(Common::Vec4f); bytes_used += new_data.size() * sizeof(Common::Vec4f);
} }
uniform_block_data.proctex_lut_dirty = false; uniform_block_data.proctex_lut_dirty = false;
} }
@@ -1991,9 +1989,7 @@ void Rasterizer::SyncAndUploadLUTs() {
if (uniform_block_data.proctex_diff_lut_dirty || invalidate) { if (uniform_block_data.proctex_diff_lut_dirty || invalidate) {
std::array<Common::Vec4f, 256> new_data; std::array<Common::Vec4f, 256> new_data;
std::transform(Pica::g_state.proctex.color_diff_table.begin(), std::ranges::transform(Pica::g_state.proctex.color_diff_table, new_data.begin(), [](const auto& entry) {
Pica::g_state.proctex.color_diff_table.end(), new_data.begin(),
[](const auto& entry) {
auto rgba = entry.ToVector() / 255.0f; auto rgba = entry.ToVector() / 255.0f;
return Common::Vec4f{rgba.r(), rgba.g(), rgba.b(), rgba.a()}; return Common::Vec4f{rgba.r(), rgba.g(), rgba.b(), rgba.a()};
}); });