summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <ericbunnie@gmail.com>2014-04-18 05:48:23 +0200
committerbunnei <ericbunnie@gmail.com>2014-04-18 05:48:23 +0200
commit70c2cce963264678b5ba5b6aa17c2653bf459e61 (patch)
tree0d3335e7dda2431260384a802c93dfda2d1ffc87
parentadded NDMA hardware interface (diff)
downloadyuzu-70c2cce963264678b5ba5b6aa17c2653bf459e61.tar
yuzu-70c2cce963264678b5ba5b6aa17c2653bf459e61.tar.gz
yuzu-70c2cce963264678b5ba5b6aa17c2653bf459e61.tar.bz2
yuzu-70c2cce963264678b5ba5b6aa17c2653bf459e61.tar.lz
yuzu-70c2cce963264678b5ba5b6aa17c2653bf459e61.tar.xz
yuzu-70c2cce963264678b5ba5b6aa17c2653bf459e61.tar.zst
yuzu-70c2cce963264678b5ba5b6aa17c2653bf459e61.zip
-rw-r--r--src/core/core.vcxproj4
-rw-r--r--src/core/core.vcxproj.filters12
-rw-r--r--src/core/hle/syscall.cpp2
-rw-r--r--src/core/hw/hw.cpp2
-rw-r--r--src/core/hw/lcd.cpp (renamed from src/core/hw/hw_lcd.cpp)2
-rw-r--r--src/core/hw/lcd.h (renamed from src/core/hw/hw_lcd.h)0
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.cpp2
7 files changed, 11 insertions, 13 deletions
diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj
index 80bd75eeb..b6fc604c6 100644
--- a/src/core/core.vcxproj
+++ b/src/core/core.vcxproj
@@ -160,7 +160,7 @@
<ClCompile Include="hle\service\srv.cpp" />
<ClCompile Include="hle\syscall.cpp" />
<ClCompile Include="hw\hw.cpp" />
- <ClCompile Include="hw\hw_lcd.cpp" />
+ <ClCompile Include="hw\lcd.cpp" />
<ClCompile Include="hw\ndma.cpp" />
<ClCompile Include="loader.cpp" />
<ClCompile Include="mem_map.cpp" />
@@ -199,7 +199,7 @@
<ClInclude Include="hle\service\srv.h" />
<ClInclude Include="hle\syscall.h" />
<ClInclude Include="hw\hw.h" />
- <ClInclude Include="hw\hw_lcd.h" />
+ <ClInclude Include="hw\lcd.h" />
<ClInclude Include="hw\ndma.h" />
<ClInclude Include="loader.h" />
<ClInclude Include="mem_map.h" />
diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters
index 61cb6e405..ff7877feb 100644
--- a/src/core/core.vcxproj.filters
+++ b/src/core/core.vcxproj.filters
@@ -69,9 +69,6 @@
<ClCompile Include="hw\hw.cpp">
<Filter>hw</Filter>
</ClCompile>
- <ClCompile Include="hw\hw_lcd.cpp">
- <Filter>hw</Filter>
- </ClCompile>
<ClCompile Include="elf\elf_reader.cpp">
<Filter>elf</Filter>
</ClCompile>
@@ -105,6 +102,9 @@
<ClCompile Include="hw\ndma.cpp">
<Filter>hw</Filter>
</ClCompile>
+ <ClCompile Include="hw\lcd.cpp">
+ <Filter>hw</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="arm\disassembler\arm_disasm.h">
@@ -161,9 +161,6 @@
<ClInclude Include="hw\hw.h">
<Filter>hw</Filter>
</ClInclude>
- <ClInclude Include="hw\hw_lcd.h">
- <Filter>hw</Filter>
- </ClInclude>
<ClInclude Include="elf\elf_reader.h">
<Filter>elf</Filter>
</ClInclude>
@@ -205,6 +202,9 @@
<ClInclude Include="hw\ndma.h">
<Filter>hw</Filter>
</ClInclude>
+ <ClInclude Include="hw\lcd.h">
+ <Filter>hw</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<Text Include="CMakeLists.txt" />
diff --git a/src/core/hle/syscall.cpp b/src/core/hle/syscall.cpp
index 0cb563955..e5533a741 100644
--- a/src/core/hle/syscall.cpp
+++ b/src/core/hle/syscall.cpp
@@ -6,8 +6,6 @@
#include "core/mem_map.h"
-#include "core/hw/hw_lcd.h"
-
#include "core/hle/function_wrappers.h"
#include "core/hle/syscall.h"
#include "core/hle/service/service.h"
diff --git a/src/core/hw/hw.cpp b/src/core/hw/hw.cpp
index 1f240f09c..16bd70125 100644
--- a/src/core/hw/hw.cpp
+++ b/src/core/hw/hw.cpp
@@ -6,7 +6,7 @@
#include "common/log.h"
#include "core/hw/hw.h"
-#include "core/hw/hw_lcd.h"
+#include "core/hw/lcd.h"
#include "core/hw/ndma.h"
namespace HW {
diff --git a/src/core/hw/hw_lcd.cpp b/src/core/hw/lcd.cpp
index 9fb485bac..3013673f8 100644
--- a/src/core/hw/hw_lcd.cpp
+++ b/src/core/hw/lcd.cpp
@@ -6,7 +6,7 @@
#include "common/log.h"
#include "core/core.h"
-#include "core/hw/hw_lcd.h"
+#include "core/hw/lcd.h"
#include "video_core/video_core.h"
diff --git a/src/core/hw/hw_lcd.h b/src/core/hw/lcd.h
index 386ed6004..386ed6004 100644
--- a/src/core/hw/hw_lcd.h
+++ b/src/core/hw/lcd.h
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp
index 168de9253..35804aee1 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.cpp
+++ b/src/video_core/renderer_opengl/renderer_opengl.cpp
@@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#include "core/hw/hw_lcd.h"
+#include "core/hw/lcd.h"
#include "video_core/video_core.h"
#include "video_core/renderer_opengl/renderer_opengl.h"