summaryrefslogtreecommitdiffstats
path: root/src/video_core
diff options
context:
space:
mode:
authorbunnei <ericbunnie@gmail.com>2014-04-09 02:15:08 +0200
committerbunnei <ericbunnie@gmail.com>2014-04-09 02:15:08 +0200
commitde0a034a849f5a1cbe2fed9ef2cc4095c56e672a (patch)
treec19b7a97fded29a04d7aca5702ab901820a663dc /src/video_core
parentgot rid of 'src' folders in each sub-project (diff)
downloadyuzu-de0a034a849f5a1cbe2fed9ef2cc4095c56e672a.tar
yuzu-de0a034a849f5a1cbe2fed9ef2cc4095c56e672a.tar.gz
yuzu-de0a034a849f5a1cbe2fed9ef2cc4095c56e672a.tar.bz2
yuzu-de0a034a849f5a1cbe2fed9ef2cc4095c56e672a.tar.lz
yuzu-de0a034a849f5a1cbe2fed9ef2cc4095c56e672a.tar.xz
yuzu-de0a034a849f5a1cbe2fed9ef2cc4095c56e672a.tar.zst
yuzu-de0a034a849f5a1cbe2fed9ef2cc4095c56e672a.zip
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/renderer_base.h3
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.cpp7
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.h6
-rw-r--r--src/video_core/utils.cpp2
-rw-r--r--src/video_core/utils.h2
-rw-r--r--src/video_core/video_core.cpp14
-rw-r--r--src/video_core/video_core.h5
-rw-r--r--src/video_core/video_core.vcxproj14
-rw-r--r--src/video_core/video_core.vcxproj.filters24
9 files changed, 39 insertions, 38 deletions
diff --git a/src/video_core/renderer_base.h b/src/video_core/renderer_base.h
index 94748d690..bc65bf0ce 100644
--- a/src/video_core/renderer_base.h
+++ b/src/video_core/renderer_base.h
@@ -4,8 +4,7 @@
#pragma once
-#include "common.h"
-#include "hash.h"
+#include "common/common.h"
class RendererBase {
public:
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp
index 6010bcbc3..97f84c248 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.cpp
+++ b/src/video_core/renderer_opengl/renderer_opengl.cpp
@@ -2,9 +2,10 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#include "mem_map.h"
-#include "video_core.h"
-#include "renderer_opengl/renderer_opengl.h"
+#include "video_core/video_core.h"
+#include "video_core/renderer_opengl/renderer_opengl.h"
+
+#include "core/mem_map.h"
/// RendererOpenGL constructor
diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h
index 86dc7b70e..00aa17649 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.h
+++ b/src/video_core/renderer_opengl/renderer_opengl.h
@@ -6,10 +6,10 @@
#include <GL/glew.h>
-#include "common.h"
-#include "emu_window.h"
+#include "common/common.h"
+#include "common/emu_window.h"
-#include "renderer_base.h"
+#include "video_core/renderer_base.h"
class RendererOpenGL : virtual public RendererBase {
diff --git a/src/video_core/utils.cpp b/src/video_core/utils.cpp
index a6dd1e02c..67d74a2d8 100644
--- a/src/video_core/utils.cpp
+++ b/src/video_core/utils.cpp
@@ -5,7 +5,7 @@
#include <stdio.h>
#include <string.h>
-#include "utils.h"
+#include "video_core/utils.h"
namespace VideoCore {
diff --git a/src/video_core/utils.h b/src/video_core/utils.h
index c417342e1..20d4ec9e0 100644
--- a/src/video_core/utils.h
+++ b/src/video_core/utils.h
@@ -6,7 +6,7 @@
#include <string>
-#include "common_types.h"
+#include "common/common_types.h"
namespace FormatPrecision {
diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp
index 6c0c415f5..e227b6795 100644
--- a/src/video_core/video_core.cpp
+++ b/src/video_core/video_core.cpp
@@ -2,15 +2,15 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
-#include "common.h"
-#include "emu_window.h"
-#include "log.h"
+#include "common/common.h"
+#include "common/emu_window.h"
+#include "common/log.h"
-#include "core.h"
+#include "core/core.h"
-#include "video_core.h"
-#include "renderer_base.h"
-#include "renderer_opengl/renderer_opengl.h"
+#include "video_core/video_core.h"
+#include "video_core/renderer_base.h"
+#include "video_core/renderer_opengl/renderer_opengl.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
// Video Core namespace
diff --git a/src/video_core/video_core.h b/src/video_core/video_core.h
index 19bf49dd7..d227b6aa4 100644
--- a/src/video_core/video_core.h
+++ b/src/video_core/video_core.h
@@ -4,8 +4,9 @@
#pragma once
-#include "common.h"
-#include "emu_window.h"
+#include "common/common.h"
+#include "common/emu_window.h"
+
#include "renderer_base.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/video_core/video_core.vcxproj b/src/video_core/video_core.vcxproj
index 5c56e9b71..d8c53271e 100644
--- a/src/video_core/video_core.vcxproj
+++ b/src/video_core/video_core.vcxproj
@@ -19,15 +19,15 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="src\renderer_opengl\renderer_opengl.cpp" />
- <ClCompile Include="src\utils.cpp" />
- <ClCompile Include="src\video_core.cpp" />
+ <ClCompile Include="renderer_opengl\renderer_opengl.cpp" />
+ <ClCompile Include="utils.cpp" />
+ <ClCompile Include="video_core.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="src\renderer_base.h" />
- <ClInclude Include="src\renderer_opengl\renderer_opengl.h" />
- <ClInclude Include="src\utils.h" />
- <ClInclude Include="src\video_core.h" />
+ <ClInclude Include="renderer_base.h" />
+ <ClInclude Include="renderer_opengl\renderer_opengl.h" />
+ <ClInclude Include="utils.h" />
+ <ClInclude Include="video_core.h" />
</ItemGroup>
<ItemGroup>
<Text Include="CMakeLists.txt" />
diff --git a/src/video_core/video_core.vcxproj.filters b/src/video_core/video_core.vcxproj.filters
index e796fbe21..4eb2ef0a4 100644
--- a/src/video_core/video_core.vcxproj.filters
+++ b/src/video_core/video_core.vcxproj.filters
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
- <ClCompile Include="src\video_core.cpp" />
- <ClCompile Include="src\utils.cpp" />
- <ClCompile Include="src\renderer_opengl\renderer_opengl.cpp">
+ <Filter Include="renderer_opengl">
+ <UniqueIdentifier>{e0245557-dbd4-423e-9399-513d5e99f1e4}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="renderer_opengl\renderer_opengl.cpp">
<Filter>renderer_opengl</Filter>
</ClCompile>
+ <ClCompile Include="utils.cpp" />
+ <ClCompile Include="video_core.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="src\renderer_base.h" />
- <ClInclude Include="src\video_core.h" />
- <ClInclude Include="src\utils.h" />
- <ClInclude Include="src\renderer_opengl\renderer_opengl.h">
+ <ClInclude Include="renderer_opengl\renderer_opengl.h">
<Filter>renderer_opengl</Filter>
</ClInclude>
+ <ClInclude Include="renderer_base.h" />
+ <ClInclude Include="utils.h" />
+ <ClInclude Include="video_core.h" />
</ItemGroup>
<ItemGroup>
<Text Include="CMakeLists.txt" />
</ItemGroup>
- <ItemGroup>
- <Filter Include="renderer_opengl">
- <UniqueIdentifier>{e0245557-dbd4-423e-9399-513d5e99f1e4}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
</Project> \ No newline at end of file