Merge pull request #267 from bunnei/apt-shared-font
APT shared font loading
This commit is contained in:
commit
a6791e4fc7
9 changed files with 140 additions and 94 deletions
|
@ -116,7 +116,7 @@ struct Regs {
|
|||
u32 address;
|
||||
|
||||
u32 GetPhysicalAddress() const {
|
||||
return DecodeAddressRegister(address) - Memory::FCRAM_PADDR + Memory::HEAP_GSP_VADDR;
|
||||
return DecodeAddressRegister(address) - Memory::FCRAM_PADDR + Memory::HEAP_LINEAR_VADDR;
|
||||
}
|
||||
|
||||
// texture1 and texture2 store the texture format directly after the address
|
||||
|
@ -312,7 +312,7 @@ struct Regs {
|
|||
|
||||
inline u32 GetBaseAddress() const {
|
||||
// TODO: Ugly, should fix PhysicalToVirtualAddress instead
|
||||
return DecodeAddressRegister(base_address) - Memory::FCRAM_PADDR + Memory::HEAP_GSP_VADDR;
|
||||
return DecodeAddressRegister(base_address) - Memory::FCRAM_PADDR + Memory::HEAP_LINEAR_VADDR;
|
||||
}
|
||||
|
||||
// Descriptor for internal vertex attributes
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue