diff options
| author | 2019-03-03 23:17:35 -0500 | |
|---|---|---|
| committer | 2019-03-20 22:36:02 -0400 | |
| commit | 241563d15c8b831a2d2b7c360d570cc721903d14 (patch) | |
| tree | f43f13d6af3b9b7e2cc92d241d7aabc490ee6ef0 /src/video_core/renderer_vulkan | |
| parent | Merge pull request #2272 from lioncash/boost (diff) | |
| download | yuzu-241563d15c8b831a2d2b7c360d570cc721903d14.tar.gz yuzu-241563d15c8b831a2d2b7c360d570cc721903d14.tar.xz yuzu-241563d15c8b831a2d2b7c360d570cc721903d14.zip | |
gpu: Move GPUVAddr definition to common_types.
Diffstat (limited to 'src/video_core/renderer_vulkan')
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_buffer_cache.cpp | 3 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_buffer_cache.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp b/src/video_core/renderer_vulkan/vk_buffer_cache.cpp index 95eab3fec..eac51ecb3 100644 --- a/src/video_core/renderer_vulkan/vk_buffer_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_buffer_cache.cpp | |||
| @@ -39,8 +39,7 @@ VKBufferCache::VKBufferCache(Tegra::MemoryManager& tegra_memory_manager, | |||
| 39 | 39 | ||
| 40 | VKBufferCache::~VKBufferCache() = default; | 40 | VKBufferCache::~VKBufferCache() = default; |
| 41 | 41 | ||
| 42 | u64 VKBufferCache::UploadMemory(Tegra::GPUVAddr gpu_addr, std::size_t size, u64 alignment, | 42 | u64 VKBufferCache::UploadMemory(GPUVAddr gpu_addr, std::size_t size, u64 alignment, bool cache) { |
| 43 | bool cache) { | ||
| 44 | const auto cpu_addr{tegra_memory_manager.GpuToCpuAddress(gpu_addr)}; | 43 | const auto cpu_addr{tegra_memory_manager.GpuToCpuAddress(gpu_addr)}; |
| 45 | ASSERT_MSG(cpu_addr, "Invalid GPU address"); | 44 | ASSERT_MSG(cpu_addr, "Invalid GPU address"); |
| 46 | 45 | ||
diff --git a/src/video_core/renderer_vulkan/vk_buffer_cache.h b/src/video_core/renderer_vulkan/vk_buffer_cache.h index 8b415744b..08b786aad 100644 --- a/src/video_core/renderer_vulkan/vk_buffer_cache.h +++ b/src/video_core/renderer_vulkan/vk_buffer_cache.h | |||
| @@ -68,8 +68,7 @@ public: | |||
| 68 | 68 | ||
| 69 | /// Uploads data from a guest GPU address. Returns host's buffer offset where it's been | 69 | /// Uploads data from a guest GPU address. Returns host's buffer offset where it's been |
| 70 | /// allocated. | 70 | /// allocated. |
| 71 | u64 UploadMemory(Tegra::GPUVAddr gpu_addr, std::size_t size, u64 alignment = 4, | 71 | u64 UploadMemory(GPUVAddr gpu_addr, std::size_t size, u64 alignment = 4, bool cache = true); |
| 72 | bool cache = true); | ||
| 73 | 72 | ||
| 74 | /// Uploads from a host memory. Returns host's buffer offset where it's been allocated. | 73 | /// Uploads from a host memory. Returns host's buffer offset where it's been allocated. |
| 75 | u64 UploadHostMemory(const u8* raw_pointer, std::size_t size, u64 alignment = 4); | 74 | u64 UploadHostMemory(const u8* raw_pointer, std::size_t size, u64 alignment = 4); |