diff options
| author | 2014-11-22 22:35:45 -0500 | |
|---|---|---|
| committer | 2014-12-12 00:15:47 -0500 | |
| commit | 4cb7a44d4e30cd7bc0ec0f07b4b734a7e03f1a3a (patch) | |
| tree | c8ad6079befffdc1548e9402ca342f15610ad598 /src/video_core | |
| parent | Merge pull request #256 from Subv/mutex (diff) | |
| download | yuzu-4cb7a44d4e30cd7bc0ec0f07b4b734a7e03f1a3a.tar.gz yuzu-4cb7a44d4e30cd7bc0ec0f07b4b734a7e03f1a3a.tar.xz yuzu-4cb7a44d4e30cd7bc0ec0f07b4b734a7e03f1a3a.zip | |
MemMap: Renamed "GSP" heap to "linear", as this is not specific to GSP.
- Linear simply indicates that the mapped physical address is always MappedVAddr+0x0C000000, thus this memory can be used for hardware devices' DMA (such as the GPU).
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/pica.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/pica.h b/src/video_core/pica.h index 8bac178ca..4c3791ad9 100644 --- a/src/video_core/pica.h +++ b/src/video_core/pica.h | |||
| @@ -116,7 +116,7 @@ struct Regs { | |||
| 116 | u32 address; | 116 | u32 address; |
| 117 | 117 | ||
| 118 | u32 GetPhysicalAddress() const { | 118 | u32 GetPhysicalAddress() const { |
| 119 | return DecodeAddressRegister(address) - Memory::FCRAM_PADDR + Memory::HEAP_GSP_VADDR; | 119 | return DecodeAddressRegister(address) - Memory::FCRAM_PADDR + Memory::HEAP_LINEAR_VADDR; |
| 120 | } | 120 | } |
| 121 | 121 | ||
| 122 | // texture1 and texture2 store the texture format directly after the address | 122 | // texture1 and texture2 store the texture format directly after the address |
| @@ -312,7 +312,7 @@ struct Regs { | |||
| 312 | 312 | ||
| 313 | inline u32 GetBaseAddress() const { | 313 | inline u32 GetBaseAddress() const { |
| 314 | // TODO: Ugly, should fix PhysicalToVirtualAddress instead | 314 | // TODO: Ugly, should fix PhysicalToVirtualAddress instead |
| 315 | return DecodeAddressRegister(base_address) - Memory::FCRAM_PADDR + Memory::HEAP_GSP_VADDR; | 315 | return DecodeAddressRegister(base_address) - Memory::FCRAM_PADDR + Memory::HEAP_LINEAR_VADDR; |
| 316 | } | 316 | } |
| 317 | 317 | ||
| 318 | // Descriptor for internal vertex attributes | 318 | // Descriptor for internal vertex attributes |