diff options
| author | 2019-11-26 15:19:15 -0500 | |
|---|---|---|
| committer | 2019-11-26 21:55:38 -0500 | |
| commit | 3f08e8d8d4ef16cf2468620fbfbdac46e43dcaef (patch) | |
| tree | 0e13cc5e2595d7019f8e9e80fe0279dc6a2b1d4c /src/video_core/renderer_vulkan | |
| parent | core: Prepare various classes for memory read/write migration (diff) | |
| download | yuzu-3f08e8d8d4ef16cf2468620fbfbdac46e43dcaef.tar.gz yuzu-3f08e8d8d4ef16cf2468620fbfbdac46e43dcaef.tar.xz yuzu-3f08e8d8d4ef16cf2468620fbfbdac46e43dcaef.zip | |
core/memory: Migrate over GetPointer()
With all of the interfaces ready for migration, it's trivial to migrate
over GetPointer().
Diffstat (limited to 'src/video_core/renderer_vulkan')
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_buffer_cache.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp b/src/video_core/renderer_vulkan/vk_buffer_cache.cpp index 959638747..46da81aaa 100644 --- a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_buffer_cache.cpp | |||
| @@ -50,9 +50,9 @@ u64 VKBufferCache::UploadMemory(GPUVAddr gpu_addr, std::size_t size, u64 alignme | |||
| 50 | // TODO: Figure out which size is the best for given games. | 50 | // TODO: Figure out which size is the best for given games. |
| 51 | cache &= size >= 2048; | 51 | cache &= size >= 2048; |
| 52 | 52 | ||
| 53 | const auto& host_ptr{Memory::GetPointer(*cpu_addr)}; | 53 | u8* const host_ptr{cpu_memory.GetPointer(*cpu_addr)}; |
| 54 | if (cache) { | 54 | if (cache) { |
| 55 | auto entry = TryGet(host_ptr); | 55 | const auto entry = TryGet(host_ptr); |
| 56 | if (entry) { | 56 | if (entry) { |
| 57 | if (entry->GetSize() >= size && entry->GetAlignment() == alignment) { | 57 | if (entry->GetSize() >= size && entry->GetAlignment() == alignment) { |
| 58 | return entry->GetOffset(); | 58 | return entry->GetOffset(); |
| @@ -64,7 +64,7 @@ u64 VKBufferCache::UploadMemory(GPUVAddr gpu_addr, std::size_t size, u64 alignme | |||
| 64 | AlignBuffer(alignment); | 64 | AlignBuffer(alignment); |
| 65 | const u64 uploaded_offset = buffer_offset; | 65 | const u64 uploaded_offset = buffer_offset; |
| 66 | 66 | ||
| 67 | if (!host_ptr) { | 67 | if (host_ptr == nullptr) { |
| 68 | return uploaded_offset; | 68 | return uploaded_offset; |
| 69 | } | 69 | } |
| 70 | 70 | ||