diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-07-06 06:17:05 +0200 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-07-06 06:17:05 +0200 |
commit | 79a23ca5f0e049deaebdc9dda5a3fd689560a16c (patch) | |
tree | 4ff2c0d3bc3d6cb2e09fa8933dba9952e9732ee4 /src/video_core/buffer_cache.h | |
parent | buffer_cache: Try to fix MinGW build (diff) | |
download | yuzu-79a23ca5f0e049deaebdc9dda5a3fd689560a16c.tar yuzu-79a23ca5f0e049deaebdc9dda5a3fd689560a16c.tar.gz yuzu-79a23ca5f0e049deaebdc9dda5a3fd689560a16c.tar.bz2 yuzu-79a23ca5f0e049deaebdc9dda5a3fd689560a16c.tar.lz yuzu-79a23ca5f0e049deaebdc9dda5a3fd689560a16c.tar.xz yuzu-79a23ca5f0e049deaebdc9dda5a3fd689560a16c.tar.zst yuzu-79a23ca5f0e049deaebdc9dda5a3fd689560a16c.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/buffer_cache.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/video_core/buffer_cache.h b/src/video_core/buffer_cache.h index fa2238a92..6f868b8b4 100644 --- a/src/video_core/buffer_cache.h +++ b/src/video_core/buffer_cache.h @@ -110,9 +110,8 @@ public: MarkedForDestruction().clear(); } - [[nodiscard]] BufferInfo UploadMemory(GPUVAddr gpu_addr, std::size_t size, - std::size_t alignment = 4, bool internalize = false, - bool is_written = false) { + BufferInfo UploadMemory(GPUVAddr gpu_addr, std::size_t size, std::size_t alignment = 4, + bool internalize = false, bool is_written = false) { std::lock_guard lock{RasterizerCache<Buffer>::mutex}; auto& memory_manager = system.GPU().MemoryManager(); @@ -145,8 +144,8 @@ public: } /// Uploads from a host memory. Returns the OpenGL buffer where it's located and its offset. - [[nodiscard]] BufferInfo UploadHostMemory(const void* raw_pointer, std::size_t size, - std::size_t alignment = 4) { + BufferInfo UploadHostMemory(const void* raw_pointer, std::size_t size, + std::size_t alignment = 4) { std::lock_guard lock{RasterizerCache<Buffer>::mutex}; return StreamBufferUpload(raw_pointer, size, alignment); } |