[clang, opengl] fix opengl build on PGO build and clang-cl on windows (#3332)

- [backported] opengl: fix PGO build error
(pulled from 34332ab81326c3f2dfae2fd11ff5b18619fedb1e@pflyly/eden-nightly)

- [clang] chore: fix std::min on windows

Signed-off-by: lizzie lizzie@eden-emu.dev
Co-authored-by: DraVee <dravee@dravee.dev>
Co-authored-by: Escary <81011361+pflyly@users.noreply.github.com>
Co-authored-by: Caio Oliveira <caiooliveirafarias0@gmail.com>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3332
Reviewed-by: DraVee <dravee@eden-emu.dev>
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Co-authored-by: Lizzie <lizzie@eden-emu.dev>
Co-committed-by: Lizzie <lizzie@eden-emu.dev>
This commit is contained in:
Lizzie 2026-01-18 02:35:57 +01:00 committed by crueter
parent 833a38b443
commit 6ec6ca7c37
No known key found for this signature in database
GPG key ID: 425ACD2D4830EBC6
11 changed files with 23 additions and 17 deletions

View file

@ -462,7 +462,7 @@ void WebBrowser::WebBrowserExit(WebExitReason exit_reason, std::string last_url)
web_common_return_value.exit_reason = exit_reason;
std::memcpy(&web_common_return_value.last_url, last_url.data(),
std::min(last_url.size(), web_common_return_value.last_url.size()));
(std::min)(last_url.size(), web_common_return_value.last_url.size()));
web_common_return_value.last_url_size = last_url.size();
LOG_DEBUG(Service_AM, "WebCommonReturnValue: exit_reason={}, last_url={}, last_url_size={}",

View file

@ -111,7 +111,7 @@ Result INewsDataService::Read(Out<u64> out_size, s64 offset,
R_SUCCEED();
}
const size_t len = std::min(out_buffer.size(), opened_payload.size() - off);
const size_t len = (std::min)(out_buffer.size(), opened_payload.size() - off);
std::memcpy(out_buffer.data(), opened_payload.data() + off, len);
*out_size = len;
R_SUCCEED();

View file

@ -142,7 +142,7 @@ Result INewsDatabaseService::GetListV1(Out<s32> out_count,
const size_t start = static_cast<size_t>(std::max(0, offset));
const size_t max_records = out_buffer.size() / record_size;
const size_t available = start < list.size() ? list.size() - start : 0;
const size_t count = std::min(max_records, available);
const size_t count = (std::min)(max_records, available);
for (size_t i = 0; i < count; ++i) {
const auto& src = list[start + i];
@ -182,7 +182,7 @@ Result INewsDatabaseService::GetList(Out<s32> out_count,
const size_t start = static_cast<size_t>(std::max(0, offset));
const size_t max_records = out_buffer.size() / record_size;
const size_t available = start < list.size() ? list.size() - start : 0;
const size_t count = std::min(max_records, available);
const size_t count = (std::min)(max_records, available);
if (count > 0) {
std::memcpy(out_buffer.data(), list.data() + start, count * record_size);

View file

@ -53,7 +53,7 @@ void NewsStorage::Clear() {
void NewsStorage::CopyZ(std::span<char> dst, std::string_view src) {
std::memset(dst.data(), 0, dst.size());
std::memcpy(dst.data(), src.data(), std::min(dst.size() - 1, src.size()));
std::memcpy(dst.data(), src.data(), (std::min)(dst.size() - 1, src.size()));
}
std::string NewsStorage::MakeKey(std::string_view news_id, std::string_view user_id) {

View file

@ -1,3 +1,6 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
@ -41,7 +44,7 @@ NvResult WrapGeneric(F&& callable, std::span<const u8> input, std::span<const u8
if constexpr (HasFixedArg) {
// Read the fixed-size input value.
var_offset = std::min(sizeof(FixedArg), input.size());
var_offset = (std::min)(sizeof(FixedArg), input.size());
if (var_offset > 0) {
std::memcpy(&fixed, input.data(), var_offset);
}
@ -74,14 +77,14 @@ NvResult WrapGeneric(F&& callable, std::span<const u8> input, std::span<const u8
// Copy outputs.
if constexpr (HasFixedArg) {
if (output.size() > 0) {
std::memcpy(output.data(), &fixed, std::min(output.size(), sizeof(FixedArg)));
std::memcpy(output.data(), &fixed, (std::min)(output.size(), sizeof(FixedArg)));
}
}
if constexpr (HasVarArg) {
if (num_var_args > 0 && output.size() > var_offset) {
const size_t max_var_size = output.size() - var_offset;
std::memcpy(output.data() + var_offset, var_args.data(), std::min(max_var_size, num_var_args * sizeof(VarArg)));
std::memcpy(output.data() + var_offset, var_args.data(), (std::min)(max_var_size, num_var_args * sizeof(VarArg)));
}
}

View file

@ -1,3 +1,6 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
@ -309,7 +312,7 @@ public:
}
while (1) {
if (!cleartext_read_buf.empty()) {
*out_size = std::min(cleartext_read_buf.size(), data.size());
*out_size = (std::min)(cleartext_read_buf.size(), data.size());
std::memcpy(data.data(), cleartext_read_buf.data(), *out_size);
cleartext_read_buf.erase(cleartext_read_buf.begin(),
cleartext_read_buf.begin() + *out_size);