diff options
| author |  bunnei | 2019-03-03 23:17:35 -0500 |
|---|---|---|
| committer | bunnei | 2019-03-20 22:36:02 -0400 |
| commit | 241563d15c8b831a2d2b7c360d570cc721903d14 (patch) | |
| tree | f43f13d6af3b9b7e2cc92d241d7aabc490ee6ef0 /src/core | |
| 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/core')
| -rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp index b031ebc66..b7964d66e 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp | |||
| @@ -89,7 +89,7 @@ u32 nvhost_as_gpu::Remap(const std::vector<u8>& input, std::vector<u8>& output) | |||
| 89 | for (const auto& entry : entries) { | 89 | for (const auto& entry : entries) { |
| 90 | LOG_WARNING(Service_NVDRV, "remap entry, offset=0x{:X} handle=0x{:X} pages=0x{:X}", | 90 | LOG_WARNING(Service_NVDRV, "remap entry, offset=0x{:X} handle=0x{:X} pages=0x{:X}", |
| 91 | entry.offset, entry.nvmap_handle, entry.pages); | 91 | entry.offset, entry.nvmap_handle, entry.pages); |
| 92 | Tegra::GPUVAddr offset = static_cast<Tegra::GPUVAddr>(entry.offset) << 0x10; | 92 | GPUVAddr offset = static_cast<GPUVAddr>(entry.offset) << 0x10; |
| 93 | auto object = nvmap_dev->GetObject(entry.nvmap_handle); | 93 | auto object = nvmap_dev->GetObject(entry.nvmap_handle); |
| 94 | if (!object) { | 94 | if (!object) { |
| 95 | LOG_CRITICAL(Service_NVDRV, "nvmap {} is an invalid handle!", entry.nvmap_handle); | 95 | LOG_CRITICAL(Service_NVDRV, "nvmap {} is an invalid handle!", entry.nvmap_handle); |
| @@ -102,7 +102,7 @@ u32 nvhost_as_gpu::Remap(const std::vector<u8>& input, std::vector<u8>& output) | |||
| 102 | u64 size = static_cast<u64>(entry.pages) << 0x10; | 102 | u64 size = static_cast<u64>(entry.pages) << 0x10; |
| 103 | ASSERT(size <= object->size); | 103 | ASSERT(size <= object->size); |
| 104 | 104 | ||
| 105 | Tegra::GPUVAddr returned = gpu.MemoryManager().MapBufferEx(object->addr, offset, size); | 105 | GPUVAddr returned = gpu.MemoryManager().MapBufferEx(object->addr, offset, size); |
| 106 | ASSERT(returned == offset); | 106 | ASSERT(returned == offset); |
| 107 | } | 107 | } |
| 108 | std::memcpy(output.data(), entries.data(), output.size()); | 108 | std::memcpy(output.data(), entries.data(), output.size()); |