yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Rename LCD to GPU.

This commit is contained in:
Tony Wasserka 2014-05-17 22:50:33 +02:00 committed by bunnei
parent 87e98ff97b
commit 1dfa392824
11 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/log.h
View File

@ -60,7 +60,7 @@ enum LOG_TYPE {
NDMA, NDMA,
HLE, HLE,
RENDER, RENDER,
LCD, GPU,
HW, HW,
TIME, TIME,
NETPLAY, NETPLAY,

2
src/common/log_manager.cpp
View File

@ -65,7 +65,7 @@ LogManager::LogManager()
m_Log[LogTypes::WII_IPC_ES] = new LogContainer("WII_IPC_ES", "WII IPC ES"); m_Log[LogTypes::WII_IPC_ES] = new LogContainer("WII_IPC_ES", "WII IPC ES");
m_Log[LogTypes::WII_IPC_FILEIO] = new LogContainer("WII_IPC_FILEIO", "WII IPC FILEIO"); m_Log[LogTypes::WII_IPC_FILEIO] = new LogContainer("WII_IPC_FILEIO", "WII IPC FILEIO");
m_Log[LogTypes::RENDER] = new LogContainer("RENDER", "RENDER"); m_Log[LogTypes::RENDER] = new LogContainer("RENDER", "RENDER");
m_Log[LogTypes::LCD] = new LogContainer("LCD", "LCD"); m_Log[LogTypes::GPU] = new LogContainer("GPU", "GPU");
m_Log[LogTypes::SVC] = new LogContainer("SVC", "Supervisor Call HLE"); m_Log[LogTypes::SVC] = new LogContainer("SVC", "Supervisor Call HLE");
m_Log[LogTypes::NDMA] = new LogContainer("NDMA", "NDMA"); m_Log[LogTypes::NDMA] = new LogContainer("NDMA", "NDMA");
m_Log[LogTypes::HLE] = new LogContainer("HLE", "High Level Emulation"); m_Log[LogTypes::HLE] = new LogContainer("HLE", "High Level Emulation");

4
src/core/CMakeLists.txt
View File

@ -42,8 +42,8 @@ set(SRCS core.cpp
hle/service/hid.cpp hle/service/hid.cpp
hle/service/service.cpp hle/service/service.cpp
hle/service/srv.cpp hle/service/srv.cpp
hw/gpu.cpp
hw/hw.cpp hw/hw.cpp
hw/lcd.cpp
hw/ndma.cpp) hw/ndma.cpp)
set(HEADERS core.h set(HEADERS core.h
@ -88,8 +88,8 @@ set(HEADERS core.h
hle/service/hid.h hle/service/hid.h
hle/service/service.h hle/service/service.h
hle/service/srv.h hle/service/srv.h
hw/gpu.h
hw/hw.h hw/hw.h
hw/lcd.h
hw/ndma.h) hw/ndma.h)
add_library(core STATIC ${SRCS} ${HEADERS}) add_library(core STATIC ${SRCS} ${HEADERS})

4
src/core/core.vcxproj
View File

@ -177,8 +177,8 @@
<ClCompile Include="hle\service\service.cpp" /> <ClCompile Include="hle\service\service.cpp" />
<ClCompile Include="hle\service\srv.cpp" /> <ClCompile Include="hle\service\srv.cpp" />
<ClCompile Include="hle\svc.cpp" /> <ClCompile Include="hle\svc.cpp" />
<ClCompile Include="hw\gpu.cpp" />
<ClCompile Include="hw\hw.cpp" /> <ClCompile Include="hw\hw.cpp" />
<ClCompile Include="hw\lcd.cpp" />
<ClCompile Include="hw\ndma.cpp" /> <ClCompile Include="hw\ndma.cpp" />
<ClCompile Include="loader.cpp" /> <ClCompile Include="loader.cpp" />
<ClCompile Include="mem_map.cpp" /> <ClCompile Include="mem_map.cpp" />
@ -226,8 +226,8 @@
<ClInclude Include="hle\service\service.h" /> <ClInclude Include="hle\service\service.h" />
<ClInclude Include="hle\service\srv.h" /> <ClInclude Include="hle\service\srv.h" />
<ClInclude Include="hle\svc.h" /> <ClInclude Include="hle\svc.h" />
<ClInclude Include="hw\gpu.h" />
<ClInclude Include="hw\hw.h" /> <ClInclude Include="hw\hw.h" />
<ClInclude Include="hw\lcd.h" />
<ClInclude Include="hw\ndma.h" /> <ClInclude Include="hw\ndma.h" />
<ClInclude Include="loader.h" /> <ClInclude Include="loader.h" />
<ClInclude Include="mem_map.h" /> <ClInclude Include="mem_map.h" />

4
src/core/core.vcxproj.filters
View File

@ -102,7 +102,7 @@
<ClCompile Include="hw\ndma.cpp"> <ClCompile Include="hw\ndma.cpp">
<Filter>hw</Filter> <Filter>hw</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="hw\lcd.cpp"> <ClCompile Include="hw\gpu.cpp">
<Filter>hw</Filter> <Filter>hw</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="arm\disassembler\load_symbol_map.cpp"> <ClCompile Include="arm\disassembler\load_symbol_map.cpp">
@ -244,7 +244,7 @@
<ClInclude Include="hw\ndma.h"> <ClInclude Include="hw\ndma.h">
<Filter>hw</Filter> <Filter>hw</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="hw\lcd.h"> <ClInclude Include="hw\gpu.h">
<Filter>hw</Filter> <Filter>hw</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="arm\disassembler\load_symbol_map.h"> <ClInclude Include="arm\disassembler\load_symbol_map.h">

16
src/core/hle/service/gsp.cpp
View File

@ -10,7 +10,7 @@
#include "core/hle/hle.h" #include "core/hle/hle.h"
#include "core/hle/service/gsp.h" #include "core/hle/service/gsp.h"
#include "core/hw/lcd.h" #include "core/hw/gpu.h"
#include "video_core/gpu_debugger.h" #include "video_core/gpu_debugger.h"
@ -69,8 +69,8 @@ enum {
/// Read a GSP GPU hardware register /// Read a GSP GPU hardware register
void ReadHWRegs(Service::Interface* self) { void ReadHWRegs(Service::Interface* self) {
static const u32 framebuffer_1[] = {LCD::PADDR_VRAM_TOP_LEFT_FRAME1, LCD::PADDR_VRAM_TOP_RIGHT_FRAME1}; static const u32 framebuffer_1[] = {GPU::PADDR_VRAM_TOP_LEFT_FRAME1, GPU::PADDR_VRAM_TOP_RIGHT_FRAME1};
static const u32 framebuffer_2[] = {LCD::PADDR_VRAM_TOP_LEFT_FRAME2, LCD::PADDR_VRAM_TOP_RIGHT_FRAME2}; static const u32 framebuffer_2[] = {GPU::PADDR_VRAM_TOP_LEFT_FRAME2, GPU::PADDR_VRAM_TOP_RIGHT_FRAME2};
u32* cmd_buff = Service::GetCommandBuffer(); u32* cmd_buff = Service::GetCommandBuffer();
u32 reg_addr = cmd_buff[1]; u32 reg_addr = cmd_buff[1];
@ -85,13 +85,13 @@ void ReadHWRegs(Service::Interface* self) {
// Top framebuffer 1 addresses // Top framebuffer 1 addresses
case REG_FRAMEBUFFER_1: case REG_FRAMEBUFFER_1:
LCD::SetFramebufferLocation(LCD::FRAMEBUFFER_LOCATION_VRAM); GPU::SetFramebufferLocation(GPU::FRAMEBUFFER_LOCATION_VRAM);
memcpy(dst, framebuffer_1, size); memcpy(dst, framebuffer_1, size);
break; break;
// Top framebuffer 2 addresses // Top framebuffer 2 addresses
case REG_FRAMEBUFFER_2: case REG_FRAMEBUFFER_2:
LCD::SetFramebufferLocation(LCD::FRAMEBUFFER_LOCATION_VRAM); GPU::SetFramebufferLocation(GPU::FRAMEBUFFER_LOCATION_VRAM);
memcpy(dst, framebuffer_2, size); memcpy(dst, framebuffer_2, size);
break; break;
@ -123,9 +123,9 @@ void TriggerCmdReqQueue(Service::Interface* self) {
break; break;
case GXCommandId::SET_COMMAND_LIST_LAST: case GXCommandId::SET_COMMAND_LIST_LAST:
LCD::Write<u32>(LCD::CommandListAddress, cmd_buff[1] >> 3); GPU::Write<u32>(GPU::CommandListAddress, cmd_buff[1] >> 3);
LCD::Write<u32>(LCD::CommandListSize, cmd_buff[2] >> 3); GPU::Write<u32>(GPU::CommandListSize, cmd_buff[2] >> 3);
LCD::Write<u32>(LCD::ProcessCommandList, 1); // TODO: Not sure if we are supposed to always write this GPU::Write<u32>(GPU::ProcessCommandList, 1); // TODO: Not sure if we are supposed to always write this
break; break;
case GXCommandId::SET_MEMORY_FILL: case GXCommandId::SET_MEMORY_FILL:

18
src/core/hw/lcd.cpp → src/core/hw/gpu.cpp
View File

@ -8,12 +8,12 @@
#include "core/core.h" #include "core/core.h"
#include "core/mem_map.h" #include "core/mem_map.h"
#include "core/hle/kernel/thread.h" #include "core/hle/kernel/thread.h"
#include "core/hw/lcd.h" #include "core/hw/gpu.h"
#include "video_core/video_core.h" #include "video_core/video_core.h"
namespace LCD { namespace GPU {
Registers g_regs; Registers g_regs;
@ -61,7 +61,7 @@ const FramebufferLocation GetFramebufferLocation() {
} else if ((g_regs.framebuffer_top_right_1 & ~Memory::FCRAM_MASK) == Memory::FCRAM_PADDR) { } else if ((g_regs.framebuffer_top_right_1 & ~Memory::FCRAM_MASK) == Memory::FCRAM_PADDR) {
return FRAMEBUFFER_LOCATION_FCRAM; return FRAMEBUFFER_LOCATION_FCRAM;
} else { } else {
ERROR_LOG(LCD, "unknown framebuffer location!"); ERROR_LOG(GPU, "unknown framebuffer location!");
} }
return FRAMEBUFFER_LOCATION_UNKNOWN; return FRAMEBUFFER_LOCATION_UNKNOWN;
} }
@ -78,7 +78,7 @@ const u8* GetFramebufferPointer(const u32 address) {
case FRAMEBUFFER_LOCATION_VRAM: case FRAMEBUFFER_LOCATION_VRAM:
return (const u8*)Memory::GetPointer(Memory::VirtualAddressFromPhysical_VRAM(address)); return (const u8*)Memory::GetPointer(Memory::VirtualAddressFromPhysical_VRAM(address));
default: default:
ERROR_LOG(LCD, "unknown framebuffer location"); ERROR_LOG(GPU, "unknown framebuffer location");
} }
return NULL; return NULL;
} }
@ -123,7 +123,7 @@ inline void Read(T &var, const u32 addr) {
break; break;
default: 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; break;
} }
} }
@ -144,13 +144,13 @@ inline void Write(u32 addr, const T data) {
if (g_regs.command_processing_enabled & 1) if (g_regs.command_processing_enabled & 1)
{ {
// u32* buffer = (u32*)Memory::GetPointer(g_regs.command_list_address << 3); // 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! // TODO: Process command list!
} }
break; break;
default: 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; break;
} }
} }
@ -183,12 +183,12 @@ void Update() {
void Init() { void Init() {
g_last_ticks = Core::g_app_core->GetTicks(); g_last_ticks = Core::g_app_core->GetTicks();
SetFramebufferLocation(FRAMEBUFFER_LOCATION_FCRAM); SetFramebufferLocation(FRAMEBUFFER_LOCATION_FCRAM);
NOTICE_LOG(LCD, "initialized OK"); NOTICE_LOG(GPU, "initialized OK");
} }
/// Shutdown hardware /// Shutdown hardware
void Shutdown() { void Shutdown() {
NOTICE_LOG(LCD, "shutdown OK"); NOTICE_LOG(GPU, "shutdown OK");
} }
} // namespace } // namespace

2
src/core/hw/lcd.h → src/core/hw/gpu.h
View File

@ -6,7 +6,7 @@
#include "common/common_types.h" #include "common/common_types.h"
namespace LCD { namespace GPU {
struct Registers { struct Registers {
u32 framebuffer_top_left_1; u32 framebuffer_top_left_1;

16
src/core/hw/hw.cpp
View File

@ -6,7 +6,7 @@
#include "common/log.h" #include "common/log.h"
#include "core/hw/hw.h" #include "core/hw/hw.h"
#include "core/hw/lcd.h" #include "core/hw/gpu.h"
#include "core/hw/ndma.h" #include "core/hw/ndma.h"
namespace HW { namespace HW {
@ -34,7 +34,7 @@ enum {
VADDR_CDMA = 0xFFFDA000, // CoreLink DMA-330? Info VADDR_CDMA = 0xFFFDA000, // CoreLink DMA-330? Info
VADDR_DSP_2 = 0x1ED03000, VADDR_DSP_2 = 0x1ED03000,
VADDR_HASH_2 = 0x1EE01000, VADDR_HASH_2 = 0x1EE01000,
VADDR_LCD = 0x1EF00000, VADDR_GPU = 0x1EF00000,
}; };
template <typename T> template <typename T>
@ -46,8 +46,8 @@ inline void Read(T &var, const u32 addr) {
// NDMA::Read(var, addr); // NDMA::Read(var, addr);
// break; // break;
case VADDR_LCD: case VADDR_GPU:
LCD::Read(var, addr); GPU::Read(var, addr);
break; break;
default: default:
@ -64,8 +64,8 @@ inline void Write(u32 addr, const T data) {
// NDMA::Write(addr, data); // NDMA::Write(addr, data);
// break; // break;
case VADDR_LCD: case VADDR_GPU:
LCD::Write(addr, data); GPU::Write(addr, data);
break; break;
default: default:
@ -87,13 +87,13 @@ template void Write<u8>(u32 addr, const u8 data);
/// Update hardware /// Update hardware
void Update() { void Update() {
LCD::Update(); GPU::Update();
NDMA::Update(); NDMA::Update();
} }
/// Initialize hardware /// Initialize hardware
void Init() { void Init() {
LCD::Init(); GPU::Init();
NDMA::Init(); NDMA::Init();
NOTICE_LOG(HW, "initialized OK"); NOTICE_LOG(HW, "initialized OK");
} }

4
src/core/hw/ndma.cpp
View File

@ -37,12 +37,12 @@ void Update() {
/// Initialize hardware /// Initialize hardware
void Init() { void Init() {
NOTICE_LOG(LCD, "initialized OK"); NOTICE_LOG(GPU, "initialized OK");
} }
/// Shutdown hardware /// Shutdown hardware
void Shutdown() { void Shutdown() {
NOTICE_LOG(LCD, "shutdown OK"); NOTICE_LOG(GPU, "shutdown OK");
} }
} // namespace } // namespace

6
src/video_core/renderer_opengl/renderer_opengl.cpp
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 // Licensed under GPLv2
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "core/hw/lcd.h" #include "core/hw/gpu.h"
#include "video_core/video_core.h" #include "video_core/video_core.h"
#include "video_core/renderer_opengl/renderer_opengl.h" #include "video_core/renderer_opengl/renderer_opengl.h"
@ -77,8 +77,8 @@ void RendererOpenGL::FlipFramebuffer(const u8* in, u8* out) {
*/ */
void RendererOpenGL::RenderXFB(const common::Rect& src_rect, const common::Rect& dst_rect) { void RendererOpenGL::RenderXFB(const common::Rect& src_rect, const common::Rect& dst_rect) {
FlipFramebuffer(LCD::GetFramebufferPointer(LCD::g_regs.framebuffer_top_left_1), m_xfb_top_flipped); FlipFramebuffer(GPU::GetFramebufferPointer(GPU::g_regs.framebuffer_top_left_1), m_xfb_top_flipped);
FlipFramebuffer(LCD::GetFramebufferPointer(LCD::g_regs.framebuffer_sub_left_1), m_xfb_bottom_flipped); FlipFramebuffer(GPU::GetFramebufferPointer(GPU::g_regs.framebuffer_sub_left_1), m_xfb_bottom_flipped);
// Blit the top framebuffer // Blit the top framebuffer
// ------------------------ // ------------------------