diff options
| author | bunnei <bunneidev@gmail.com> | 2023-02-02 19:04:50 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-02 19:04:50 -0800 |
| commit | 25fc5c0e1158cb8e81cbc769b24ad84032a1fbfd (patch) | |
| tree | a86c945d2e8789250005ac38ebbb36c48e95b30c /src/core/hle/kernel/hle_ipc.h | |
| parent | af20e25081f97d55b451606c87922e2b49f0d363 (diff) | |
| parent | b01698775b468a04e4d0a9bdd86035ff00e6decb (diff) | |
Merge pull request #9718 from yuzu-emu/revert-9508-hle-ipc-buffer-span
Revert "hle_ipc: Use std::span to avoid heap allocations/copies when calling ReadBuffer"
Diffstat (limited to 'src/core/hle/kernel/hle_ipc.h')
| -rw-r--r-- | src/core/hle/kernel/hle_ipc.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h index 5bf4f171b..e252b5f4b 100644 --- a/src/core/hle/kernel/hle_ipc.h +++ b/src/core/hle/kernel/hle_ipc.h @@ -7,7 +7,6 @@ #include <functional> #include <memory> #include <optional> -#include <span> #include <string> #include <type_traits> #include <vector> @@ -271,11 +270,8 @@ public: return domain_message_header.has_value(); } - /// Helper function to get a span of a buffer using the appropriate buffer descriptor - [[nodiscard]] std::span<const u8> ReadBuffer(std::size_t buffer_index = 0) const; - - /// Helper function to read a copy of a buffer using the appropriate buffer descriptor - [[nodiscard]] std::vector<u8> ReadBufferCopy(std::size_t buffer_index = 0) const; + /// Helper function to read a buffer using the appropriate buffer descriptor + [[nodiscard]] std::vector<u8> ReadBuffer(std::size_t buffer_index = 0) const; /// Helper function to write a buffer using the appropriate buffer descriptor std::size_t WriteBuffer(const void* buffer, std::size_t size, |