diff options
| author | 2019-07-06 01:17:05 -0300 | |
|---|---|---|
| committer | 2019-07-06 01:17:05 -0300 | |
| commit | 79a23ca5f0e049deaebdc9dda5a3fd689560a16c (patch) | |
| tree | 4ff2c0d3bc3d6cb2e09fa8933dba9952e9732ee4 /src | |
| parent | buffer_cache: Try to fix MinGW build (diff) | |
| download | yuzu-79a23ca5f0e049deaebdc9dda5a3fd689560a16c.tar.gz yuzu-79a23ca5f0e049deaebdc9dda5a3fd689560a16c.tar.xz yuzu-79a23ca5f0e049deaebdc9dda5a3fd689560a16c.zip | |
buffer_cache: Avoid [[nodiscard]] to make clang-format happy
Diffstat (limited to 'src')
| -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: | |||
| 110 | MarkedForDestruction().clear(); | 110 | MarkedForDestruction().clear(); |
| 111 | } | 111 | } |
| 112 | 112 | ||
| 113 | [[nodiscard]] BufferInfo UploadMemory(GPUVAddr gpu_addr, std::size_t size, | 113 | BufferInfo UploadMemory(GPUVAddr gpu_addr, std::size_t size, std::size_t alignment = 4, |
| 114 | std::size_t alignment = 4, bool internalize = false, | 114 | bool internalize = false, bool is_written = false) { |
| 115 | bool is_written = false) { | ||
| 116 | std::lock_guard lock{RasterizerCache<Buffer>::mutex}; | 115 | std::lock_guard lock{RasterizerCache<Buffer>::mutex}; |
| 117 | 116 | ||
| 118 | auto& memory_manager = system.GPU().MemoryManager(); | 117 | auto& memory_manager = system.GPU().MemoryManager(); |
| @@ -145,8 +144,8 @@ public: | |||
| 145 | } | 144 | } |
| 146 | 145 | ||
| 147 | /// Uploads from a host memory. Returns the OpenGL buffer where it's located and its offset. | 146 | /// Uploads from a host memory. Returns the OpenGL buffer where it's located and its offset. |
| 148 | [[nodiscard]] BufferInfo UploadHostMemory(const void* raw_pointer, std::size_t size, | 147 | BufferInfo UploadHostMemory(const void* raw_pointer, std::size_t size, |
| 149 | std::size_t alignment = 4) { | 148 | std::size_t alignment = 4) { |
| 150 | std::lock_guard lock{RasterizerCache<Buffer>::mutex}; | 149 | std::lock_guard lock{RasterizerCache<Buffer>::mutex}; |
| 151 | return StreamBufferUpload(raw_pointer, size, alignment); | 150 | return StreamBufferUpload(raw_pointer, size, alignment); |
| 152 | } | 151 | } |