diff options
| author | bunnei <bunneidev@gmail.com> | 2020-01-03 18:30:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-03 18:30:56 +0100 |
| commit | 624a0f7f3f4100fc56e3d70603a30384a21e7dc6 (patch) | |
| tree | b1818bb9bc039995b9dacbda53bb99ce343f93f0 /src/core | |
| parent | Merge pull request #3267 from ReinUsesLisp/remove-maxwell-debugger (diff) | |
| parent | NvServices: Correct Ioctl Remap. (diff) | |
| download | yuzu-624a0f7f3f4100fc56e3d70603a30384a21e7dc6.tar yuzu-624a0f7f3f4100fc56e3d70603a30384a21e7dc6.tar.gz yuzu-624a0f7f3f4100fc56e3d70603a30384a21e7dc6.tar.bz2 yuzu-624a0f7f3f4100fc56e3d70603a30384a21e7dc6.tar.lz yuzu-624a0f7f3f4100fc56e3d70603a30384a21e7dc6.tar.xz yuzu-624a0f7f3f4100fc56e3d70603a30384a21e7dc6.tar.zst yuzu-624a0f7f3f4100fc56e3d70603a30384a21e7dc6.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h | 2 |
2 files changed, 5 insertions, 3 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 07c88465e..195421cc0 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp @@ -104,10 +104,12 @@ u32 nvhost_as_gpu::Remap(const std::vector<u8>& input, std::vector<u8>& output) ASSERT(object->status == nvmap::Object::Status::Allocated); - u64 size = static_cast<u64>(entry.pages) << 0x10; + const u64 size = static_cast<u64>(entry.pages) << 0x10; ASSERT(size <= object->size); + const u64 map_offset = static_cast<u64>(entry.map_offset) << 0x10; - GPUVAddr returned = gpu.MemoryManager().MapBufferEx(object->addr, offset, size); + const GPUVAddr returned = + gpu.MemoryManager().MapBufferEx(object->addr + map_offset, offset, size); ASSERT(returned == offset); } std::memcpy(output.data(), entries.data(), output.size()); diff --git a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h index 169fb8f0e..f79fcc065 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h @@ -62,7 +62,7 @@ private: u16_le flags; u16_le kind; u32_le nvmap_handle; - INSERT_PADDING_WORDS(1); + u32_le map_offset; u32_le offset; u32_le pages; }; |