daniel/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android synced 2024-12-24 21:11:20 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

buffer_cache: Avoid [[nodiscard]] to make clang-format happy

Browse Source
This commit is contained in:
ReinUsesLisp 2019-07-06 01:17:05 -03:00
parent 83050c9495
commit 79a23ca5f0
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/video_core/buffer_cache.h
View File

@ -110,9 +110,8 @@ public:
MarkedForDestruction().clear(); MarkedForDestruction().clear();
} }
[[nodiscard]] BufferInfo UploadMemory(GPUVAddr gpu_addr, std::size_t size, BufferInfo UploadMemory(GPUVAddr gpu_addr, std::size_t size, std::size_t alignment = 4,
std::size_t alignment = 4, bool internalize = false, bool internalize = false, bool is_written = false) {
bool is_written = false) {
std::lock_guard lock{RasterizerCache<Buffer>::mutex}; std::lock_guard lock{RasterizerCache<Buffer>::mutex};
auto& memory_manager = system.GPU().MemoryManager(); auto& memory_manager = system.GPU().MemoryManager();
@ -145,7 +144,7 @@ public:
} }
/// Uploads from a host memory. Returns the OpenGL buffer where it's located and its offset. /// 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, BufferInfo UploadHostMemory(const void* raw_pointer, std::size_t size,
std::size_t alignment = 4) { std::size_t alignment = 4) {
std::lock_guard lock{RasterizerCache<Buffer>::mutex}; std::lock_guard lock{RasterizerCache<Buffer>::mutex};
return StreamBufferUpload(raw_pointer, size, alignment); return StreamBufferUpload(raw_pointer, size, alignment);