Forks/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2025-10-30 21:30:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

GPU: Interface cleanup.

Browse source
This commit is contained in:
Tony Wasserka 2014-07-11 19:29:12 +02:00
parent 46950ee4de
commit 9d618d0b70
2 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/core/hw/gpu.cpp
View file

@ -53,10 +53,10 @@ void SetFramebufferLocation(const FramebufferLocation mode) {
* Gets the location of the framebuffers * Gets the location of the framebuffers
* @return Location of framebuffers as FramebufferLocation enum * @return Location of framebuffers as FramebufferLocation enum
*/ */
const FramebufferLocation GetFramebufferLocation() { FramebufferLocation GetFramebufferLocation(u32 address) {
if ((g_regs.framebuffer_top_right_1 & ~Memory::VRAM_MASK) == Memory::VRAM_PADDR) { if ((address & ~Memory::VRAM_MASK) == Memory::VRAM_PADDR) {
return FRAMEBUFFER_LOCATION_VRAM; return FRAMEBUFFER_LOCATION_VRAM;
} else if ((g_regs.framebuffer_top_right_1 & ~Memory::FCRAM_MASK) == Memory::FCRAM_PADDR) { } else if ((address & ~Memory::FCRAM_MASK) == Memory::FCRAM_PADDR) {
return FRAMEBUFFER_LOCATION_FCRAM; return FRAMEBUFFER_LOCATION_FCRAM;
} else { } else {
ERROR_LOG(GPU, "unknown framebuffer location!"); ERROR_LOG(GPU, "unknown framebuffer location!");
@ -64,21 +64,26 @@ const FramebufferLocation GetFramebufferLocation() {
return FRAMEBUFFER_LOCATION_UNKNOWN; return FRAMEBUFFER_LOCATION_UNKNOWN;
} }
u32 GetFramebufferAddr(const u32 address) {
switch (GetFramebufferLocation(address)) {
case FRAMEBUFFER_LOCATION_FCRAM:
return Memory::VirtualAddressFromPhysical_FCRAM(address);
case FRAMEBUFFER_LOCATION_VRAM:
return Memory::VirtualAddressFromPhysical_VRAM(address);
default:
ERROR_LOG(GPU, "unknown framebuffer location");
}
return 0;
}
/** /**
* Gets a read-only pointer to a framebuffer in memory * Gets a read-only pointer to a framebuffer in memory
* @param address Physical address of framebuffer * @param address Physical address of framebuffer
* @return Returns const pointer to raw framebuffer * @return Returns const pointer to raw framebuffer
*/ */
const u8* GetFramebufferPointer(const u32 address) { const u8* GetFramebufferPointer(const u32 address) {
switch (GetFramebufferLocation()) { u32 addr = GetFramebufferAddr(address);
case FRAMEBUFFER_LOCATION_FCRAM: return (addr != 0) ? Memory::GetPointer(addr) : nullptr;
return (const u8*)Memory::GetPointer(Memory::VirtualAddressFromPhysical_FCRAM(address));
case FRAMEBUFFER_LOCATION_VRAM:
return (const u8*)Memory::GetPointer(Memory::VirtualAddressFromPhysical_VRAM(address));
default:
ERROR_LOG(GPU, "unknown framebuffer location");
}
return NULL;
} }
template <typename T> template <typename T>

4
src/core/hw/gpu.h
View file

@ -219,10 +219,12 @@ void SetFramebufferLocation(const FramebufferLocation mode);
*/ */
const u8* GetFramebufferPointer(const u32 address); const u8* GetFramebufferPointer(const u32 address);
u32 GetFramebufferAddr(const u32 address);
/** /**
* Gets the location of the framebuffers * Gets the location of the framebuffers
*/ */
const FramebufferLocation GetFramebufferLocation(); FramebufferLocation GetFramebufferLocation(u32 address);
template <typename T> template <typename T>
inline void Read(T &var, const u32 addr); inline void Read(T &var, const u32 addr);