diff options
| author | 2014-04-17 23:48:23 -0400 | |
|---|---|---|
| committer | 2014-04-17 23:48:23 -0400 | |
| commit | 70c2cce963264678b5ba5b6aa17c2653bf459e61 (patch) | |
| tree | 0d3335e7dda2431260384a802c93dfda2d1ffc87 | |
| parent | added NDMA hardware interface (diff) | |
| download | yuzu-70c2cce963264678b5ba5b6aa17c2653bf459e61.tar.gz yuzu-70c2cce963264678b5ba5b6aa17c2653bf459e61.tar.xz yuzu-70c2cce963264678b5ba5b6aa17c2653bf459e61.zip | |
renamed hw_lcd module to just lcd
Diffstat (limited to '')
| -rw-r--r-- | src/core/core.vcxproj | 4 | ||||
| -rw-r--r-- | src/core/core.vcxproj.filters | 12 | ||||
| -rw-r--r-- | src/core/hle/syscall.cpp | 2 | ||||
| -rw-r--r-- | src/core/hw/hw.cpp | 2 | ||||
| -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.cpp | 2 |
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 @@ | |||
| 160 | <ClCompile Include="hle\service\srv.cpp" /> | 160 | <ClCompile Include="hle\service\srv.cpp" /> |
| 161 | <ClCompile Include="hle\syscall.cpp" /> | 161 | <ClCompile Include="hle\syscall.cpp" /> |
| 162 | <ClCompile Include="hw\hw.cpp" /> | 162 | <ClCompile Include="hw\hw.cpp" /> |
| 163 | <ClCompile Include="hw\hw_lcd.cpp" /> | 163 | <ClCompile Include="hw\lcd.cpp" /> |
| 164 | <ClCompile Include="hw\ndma.cpp" /> | 164 | <ClCompile Include="hw\ndma.cpp" /> |
| 165 | <ClCompile Include="loader.cpp" /> | 165 | <ClCompile Include="loader.cpp" /> |
| 166 | <ClCompile Include="mem_map.cpp" /> | 166 | <ClCompile Include="mem_map.cpp" /> |
| @@ -199,7 +199,7 @@ | |||
| 199 | <ClInclude Include="hle\service\srv.h" /> | 199 | <ClInclude Include="hle\service\srv.h" /> |
| 200 | <ClInclude Include="hle\syscall.h" /> | 200 | <ClInclude Include="hle\syscall.h" /> |
| 201 | <ClInclude Include="hw\hw.h" /> | 201 | <ClInclude Include="hw\hw.h" /> |
| 202 | <ClInclude Include="hw\hw_lcd.h" /> | 202 | <ClInclude Include="hw\lcd.h" /> |
| 203 | <ClInclude Include="hw\ndma.h" /> | 203 | <ClInclude Include="hw\ndma.h" /> |
| 204 | <ClInclude Include="loader.h" /> | 204 | <ClInclude Include="loader.h" /> |
| 205 | <ClInclude Include="mem_map.h" /> | 205 | <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 @@ | |||
| 69 | <ClCompile Include="hw\hw.cpp"> | 69 | <ClCompile Include="hw\hw.cpp"> |
| 70 | <Filter>hw</Filter> | 70 | <Filter>hw</Filter> |
| 71 | </ClCompile> | 71 | </ClCompile> |
| 72 | <ClCompile Include="hw\hw_lcd.cpp"> | ||
| 73 | <Filter>hw</Filter> | ||
| 74 | </ClCompile> | ||
| 75 | <ClCompile Include="elf\elf_reader.cpp"> | 72 | <ClCompile Include="elf\elf_reader.cpp"> |
| 76 | <Filter>elf</Filter> | 73 | <Filter>elf</Filter> |
| 77 | </ClCompile> | 74 | </ClCompile> |
| @@ -105,6 +102,9 @@ | |||
| 105 | <ClCompile Include="hw\ndma.cpp"> | 102 | <ClCompile Include="hw\ndma.cpp"> |
| 106 | <Filter>hw</Filter> | 103 | <Filter>hw</Filter> |
| 107 | </ClCompile> | 104 | </ClCompile> |
| 105 | <ClCompile Include="hw\lcd.cpp"> | ||
| 106 | <Filter>hw</Filter> | ||
| 107 | </ClCompile> | ||
| 108 | </ItemGroup> | 108 | </ItemGroup> |
| 109 | <ItemGroup> | 109 | <ItemGroup> |
| 110 | <ClInclude Include="arm\disassembler\arm_disasm.h"> | 110 | <ClInclude Include="arm\disassembler\arm_disasm.h"> |
| @@ -161,9 +161,6 @@ | |||
| 161 | <ClInclude Include="hw\hw.h"> | 161 | <ClInclude Include="hw\hw.h"> |
| 162 | <Filter>hw</Filter> | 162 | <Filter>hw</Filter> |
| 163 | </ClInclude> | 163 | </ClInclude> |
| 164 | <ClInclude Include="hw\hw_lcd.h"> | ||
| 165 | <Filter>hw</Filter> | ||
| 166 | </ClInclude> | ||
| 167 | <ClInclude Include="elf\elf_reader.h"> | 164 | <ClInclude Include="elf\elf_reader.h"> |
| 168 | <Filter>elf</Filter> | 165 | <Filter>elf</Filter> |
| 169 | </ClInclude> | 166 | </ClInclude> |
| @@ -205,6 +202,9 @@ | |||
| 205 | <ClInclude Include="hw\ndma.h"> | 202 | <ClInclude Include="hw\ndma.h"> |
| 206 | <Filter>hw</Filter> | 203 | <Filter>hw</Filter> |
| 207 | </ClInclude> | 204 | </ClInclude> |
| 205 | <ClInclude Include="hw\lcd.h"> | ||
| 206 | <Filter>hw</Filter> | ||
| 207 | </ClInclude> | ||
| 208 | </ItemGroup> | 208 | </ItemGroup> |
| 209 | <ItemGroup> | 209 | <ItemGroup> |
| 210 | <Text Include="CMakeLists.txt" /> | 210 | <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 @@ | |||
| 6 | 6 | ||
| 7 | #include "core/mem_map.h" | 7 | #include "core/mem_map.h" |
| 8 | 8 | ||
| 9 | #include "core/hw/hw_lcd.h" | ||
| 10 | |||
| 11 | #include "core/hle/function_wrappers.h" | 9 | #include "core/hle/function_wrappers.h" |
| 12 | #include "core/hle/syscall.h" | 10 | #include "core/hle/syscall.h" |
| 13 | #include "core/hle/service/service.h" | 11 | #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 @@ | |||
| 6 | #include "common/log.h" | 6 | #include "common/log.h" |
| 7 | 7 | ||
| 8 | #include "core/hw/hw.h" | 8 | #include "core/hw/hw.h" |
| 9 | #include "core/hw/hw_lcd.h" | 9 | #include "core/hw/lcd.h" |
| 10 | #include "core/hw/ndma.h" | 10 | #include "core/hw/ndma.h" |
| 11 | 11 | ||
| 12 | namespace HW { | 12 | 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 @@ | |||
| 6 | #include "common/log.h" | 6 | #include "common/log.h" |
| 7 | 7 | ||
| 8 | #include "core/core.h" | 8 | #include "core/core.h" |
| 9 | #include "core/hw/hw_lcd.h" | 9 | #include "core/hw/lcd.h" |
| 10 | 10 | ||
| 11 | #include "video_core/video_core.h" | 11 | #include "video_core/video_core.h" |
| 12 | 12 | ||
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 @@ | |||
| 2 | // Licensed under GPLv2 | 2 | // Licensed under GPLv2 |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "core/hw/hw_lcd.h" | 5 | #include "core/hw/lcd.h" |
| 6 | 6 | ||
| 7 | #include "video_core/video_core.h" | 7 | #include "video_core/video_core.h" |
| 8 | #include "video_core/renderer_opengl/renderer_opengl.h" | 8 | #include "video_core/renderer_opengl/renderer_opengl.h" |