Browse Source

even more wattOS fixes

Signed-off-by: lizzie <lizzie@eden-emu.dev>
pull/2763/head
lizzie 5 months ago
parent
commit
4103f57404
No known key found for this signature in database GPG Key ID: 287378CADCAB13
  1. 3
      src/audio_core/in/audio_in_system.cpp
  2. 3
      src/audio_core/out/audio_out_system.cpp
  3. 4
      src/core/hle/service/nvnflinger/hardware_composer.cpp
  4. 7
      src/core/hle/service/nvnflinger/parcel.h
  5. 1
      src/input_common/drivers/udp_client.cpp
  6. 4
      src/tests/input_common/calibration_configuration_job.cpp
  7. 3
      src/video_core/shader_cache.cpp

3
src/audio_core/in/audio_in_system.cpp

@ -1,3 +1,6 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later

3
src/audio_core/out/audio_out_system.cpp

@ -1,3 +1,6 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later

4
src/core/hle/service/nvnflinger/hardware_composer.cpp

@ -48,7 +48,11 @@ HardwareComposer::~HardwareComposer() = default;
u32 HardwareComposer::ComposeLocked(f32* out_speed_scale, Display& display, u32 HardwareComposer::ComposeLocked(f32* out_speed_scale, Display& display,
Nvidia::Devices::nvdisp_disp0& nvdisp) { Nvidia::Devices::nvdisp_disp0& nvdisp) {
#if BOOST_VERSION >= 108100 || __GNUC__ > 12
boost::container::small_vector<HwcLayer, 2> composition_stack; boost::container::small_vector<HwcLayer, 2> composition_stack;
#else //TODO: debian stable
std::vector<HwcLayer> composition_stack;
#endif
// Set default speed limit to 100%. // Set default speed limit to 100%.
*out_speed_scale = 1.0f; *out_speed_scale = 1.0f;

7
src/core/hle/service/nvnflinger/parcel.h

@ -1,3 +1,6 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
@ -180,7 +183,11 @@ private:
private: private:
boost::container::small_vector<u8, 0x1B0> m_data_buffer; boost::container::small_vector<u8, 0x1B0> m_data_buffer;
boost::container::small_vector<u8, 0x40> m_object_buffer; boost::container::small_vector<u8, 0x40> m_object_buffer;
#if BOOST_VERSION >= 108100 || __GNUC__ > 12
boost::container::small_vector<u8, 0x200> m_output_buffer; boost::container::small_vector<u8, 0x200> m_output_buffer;
#else //TODO: debian stable
std::vector<u8> m_output_buffer;
#endif
}; };
} // namespace Service::android } // namespace Service::android

1
src/input_common/drivers/udp_client.cpp

@ -5,6 +5,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include <random> #include <random>
#include <utility>
#include <boost/asio.hpp> #include <boost/asio.hpp>
#include <fmt/ranges.h> #include <fmt/ranges.h>

4
src/tests/input_common/calibration_configuration_job.cpp

@ -1,9 +1,13 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include <array> #include <array>
#include <string> #include <string>
#include <thread> #include <thread>
#include <utility>
#include <boost/asio.hpp> #include <boost/asio.hpp>
#include <boost/crc.hpp> #include <boost/crc.hpp>
#include <catch2/catch_test_macros.hpp> #include <catch2/catch_test_macros.hpp>

3
src/video_core/shader_cache.cpp

@ -1,3 +1,6 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later

Loading…
Cancel
Save