diff options
| author |  Weiyi Wang | 2017-07-22 10:15:52 +0300 |
|---|---|---|
| committer |  GitHub | 2017-07-22 10:15:52 +0300 |
| commit | 045d0b5bbdf790952ddfedcfc8816c0afc7a2300 (patch) | |
| tree | fba1a440adf7d7ecd59edaf48e215e70b7c6cf9e /src/core/hle/kernel | |
| parent | Merge pull request #2833 from j-selby/single-header-json (diff) | |
| parent | Memory: Add function to flush a virtual range from the rasterizer cache (diff) | |
| download | yuzu-045d0b5bbdf790952ddfedcfc8816c0afc7a2300.tar.gz yuzu-045d0b5bbdf790952ddfedcfc8816c0afc7a2300.tar.xz yuzu-045d0b5bbdf790952ddfedcfc8816c0afc7a2300.zip | |
Merge pull request #2799 from yuriks/virtual-cached-range-flush
Add address conversion functions returning optional, Add function to flush virtual region from rasterizer cache
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/shared_memory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp index 922e5ab58..a7b66142f 100644 --- a/src/core/hle/kernel/shared_memory.cpp +++ b/src/core/hle/kernel/shared_memory.cpp | |||
| @@ -149,7 +149,7 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi | |||
| 149 | 149 | ||
| 150 | if (base_address == 0 && target_address == 0) { | 150 | if (base_address == 0 && target_address == 0) { |
| 151 | // Calculate the address at which to map the memory block. | 151 | // Calculate the address at which to map the memory block. |
| 152 | target_address = Memory::PhysicalToVirtualAddress(linear_heap_phys_address); | 152 | target_address = Memory::PhysicalToVirtualAddress(linear_heap_phys_address).value(); |
| 153 | } | 153 | } |
| 154 | 154 | ||
| 155 | // Map the memory block into the target process | 155 | // Map the memory block into the target process |