diff options
author | Tony Wasserka <NeoBrainX@gmail.com> | 2014-05-17 22:50:33 +0200 |
---|---|---|
committer | bunnei <ericbunnie@gmail.com> | 2014-06-12 12:10:49 +0200 |
commit | 1dfa3928242ad486040b1c65768faa2c7fce4654 (patch) | |
tree | 50efedc7e5090c36df63043bd542e7e8508fa1c0 /src/core/hw/gpu.cpp | |
parent | citra-qt: Add GX command history viewer. (diff) | |
download | yuzu-1dfa3928242ad486040b1c65768faa2c7fce4654.tar yuzu-1dfa3928242ad486040b1c65768faa2c7fce4654.tar.gz yuzu-1dfa3928242ad486040b1c65768faa2c7fce4654.tar.bz2 yuzu-1dfa3928242ad486040b1c65768faa2c7fce4654.tar.lz yuzu-1dfa3928242ad486040b1c65768faa2c7fce4654.tar.xz yuzu-1dfa3928242ad486040b1c65768faa2c7fce4654.tar.zst yuzu-1dfa3928242ad486040b1c65768faa2c7fce4654.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hw/gpu.cpp (renamed from src/core/hw/lcd.cpp) | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/core/hw/lcd.cpp b/src/core/hw/gpu.cpp index 61ee99c1f..632e1aaac 100644 --- a/src/core/hw/lcd.cpp +++ b/src/core/hw/gpu.cpp @@ -8,12 +8,12 @@ #include "core/core.h" #include "core/mem_map.h" #include "core/hle/kernel/thread.h" -#include "core/hw/lcd.h" +#include "core/hw/gpu.h" #include "video_core/video_core.h" -namespace LCD { +namespace GPU { Registers g_regs; @@ -61,7 +61,7 @@ const FramebufferLocation GetFramebufferLocation() { } else if ((g_regs.framebuffer_top_right_1 & ~Memory::FCRAM_MASK) == Memory::FCRAM_PADDR) { return FRAMEBUFFER_LOCATION_FCRAM; } else { - ERROR_LOG(LCD, "unknown framebuffer location!"); + ERROR_LOG(GPU, "unknown framebuffer location!"); } return FRAMEBUFFER_LOCATION_UNKNOWN; } @@ -78,7 +78,7 @@ const u8* GetFramebufferPointer(const u32 address) { case FRAMEBUFFER_LOCATION_VRAM: return (const u8*)Memory::GetPointer(Memory::VirtualAddressFromPhysical_VRAM(address)); default: - ERROR_LOG(LCD, "unknown framebuffer location"); + ERROR_LOG(GPU, "unknown framebuffer location"); } return NULL; } @@ -123,7 +123,7 @@ inline void Read(T &var, const u32 addr) { break; default: - ERROR_LOG(LCD, "unknown Read%d @ 0x%08X", sizeof(var) * 8, addr); + ERROR_LOG(GPU, "unknown Read%d @ 0x%08X", sizeof(var) * 8, addr); break; } } @@ -144,13 +144,13 @@ inline void Write(u32 addr, const T data) { if (g_regs.command_processing_enabled & 1) { // u32* buffer = (u32*)Memory::GetPointer(g_regs.command_list_address << 3); - ERROR_LOG(LCD, "Beginning %x bytes of commands from address %x", g_regs.command_list_size, g_regs.command_list_address << 3); + ERROR_LOG(GPU, "Beginning %x bytes of commands from address %x", g_regs.command_list_size, g_regs.command_list_address << 3); // TODO: Process command list! } break; default: - ERROR_LOG(LCD, "unknown Write%d 0x%08X @ 0x%08X", sizeof(data) * 8, data, addr); + ERROR_LOG(GPU, "unknown Write%d 0x%08X @ 0x%08X", sizeof(data) * 8, data, addr); break; } } @@ -183,12 +183,12 @@ void Update() { void Init() { g_last_ticks = Core::g_app_core->GetTicks(); SetFramebufferLocation(FRAMEBUFFER_LOCATION_FCRAM); - NOTICE_LOG(LCD, "initialized OK"); + NOTICE_LOG(GPU, "initialized OK"); } /// Shutdown hardware void Shutdown() { - NOTICE_LOG(LCD, "shutdown OK"); + NOTICE_LOG(GPU, "shutdown OK"); } } // namespace |