ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1369 from PCSX2-Alpha/GSDX_PSX 

GSDX: Move PSX code to an isolated path
This commit is contained in:
Gregory Hainaut 2016-05-26 18:45:41 +02:00
parent 06dba2d258 2409817556
commit 9150747df1
26 changed files with 109 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
plugins/GSdx/CMakeLists.txt
View File

@ -39,14 +39,14 @@ endif()
set(GSdxSources
GLLoader.cpp
GLState.cpp
GPU.cpp
GPUDrawScanline.cpp
GPUDrawScanlineCodeGenerator.cpp
GPULocalMemory.cpp
GPURenderer.cpp
GPURendererSW.cpp
GPUSetupPrimCodeGenerator.cpp
GPUState.cpp
PSX/GPU.cpp
PSX/GPUDrawScanline.cpp
PSX/GPUDrawScanlineCodeGenerator.cpp
PSX/GPULocalMemory.cpp
PSX/GPURenderer.cpp
PSX/GPURendererSW.cpp
PSX/GPUSetupPrimCodeGenerator.cpp
PSX/GPUState.cpp
GS.cpp
GSAlignedClass.cpp
GSBlock.cpp
@ -72,7 +72,7 @@ set(GSdxSources
GSHwHack.cpp
GSLinuxDialog.cpp
GSLocalMemory.cpp
GSLzma.cpp
GSLzma.cpp
GSPerfMon.cpp
GSPng.cpp
GSRasterizer.cpp
@ -111,17 +111,17 @@ set(GSdxSources
)
set(GSdxHeaders
GPU.h
GPUDrawScanline.h
GPUDrawScanlineCodeGenerator.h
GPUDrawingEnvironment.h
GPULocalMemory.h
GPURenderer.h
GPURendererSW.h
GPUScanlineEnvironment.h
GPUSetupPrimCodeGenerator.h
GPUState.h
GPUVertex.h
PSX/GPU.h
PSX/GPUDrawScanline.h
PSX/GPUDrawScanlineCodeGenerator.h
PSX/GPUDrawingEnvironment.h
PSX/GPULocalMemory.h
PSX/GPURenderer.h
PSX/GPURendererSW.h
PSX/GPUScanlineEnvironment.h
PSX/GPUSetupPrimCodeGenerator.h
PSX/GPUState.h
PSX/GPUVertex.h
GS.h
GSAlignedClass.h
GSBlock.h

2
plugins/GSdx/GSdx.cpp
View File

@ -22,7 +22,7 @@
#include "stdafx.h"
#include "GSdx.h"
#include "GS.h"
#include "GPU.h"
#include "PSX/GPU.h"
static void* s_hModule;

42
plugins/GSdx/GSdx.vcxproj
View File

@ -578,15 +578,6 @@
<ItemGroup>
<ClCompile Include="GLLoader.cpp" />
<ClCompile Include="GLState.cpp" />
<ClCompile Include="GPU.cpp" />
<ClCompile Include="GPUDrawScanline.cpp" />
<ClCompile Include="GPUDrawScanlineCodeGenerator.cpp" />
<ClCompile Include="GPULocalMemory.cpp" />
<ClCompile Include="GPURenderer.cpp" />
<ClCompile Include="GPURendererSW.cpp" />
<ClCompile Include="GPUSettingsDlg.cpp" />
<ClCompile Include="GPUSetupPrimCodeGenerator.cpp" />
<ClCompile Include="GPUState.cpp" />
<ClCompile Include="GS.cpp" />
<ClCompile Include="GSAlignedClass.cpp" />
<ClCompile Include="GSBlock.cpp" />
@ -809,6 +800,15 @@
<ClCompile Include="GSWnd.cpp" />
<ClCompile Include="GSWndDX.cpp" />
<ClCompile Include="GSWndWGL.cpp" />
<ClCompile Include="PSX\GPU.cpp" />
<ClCompile Include="PSX\GPUDrawScanline.cpp" />
<ClCompile Include="PSX\GPUDrawScanlineCodeGenerator.cpp" />
<ClCompile Include="PSX\GPULocalMemory.cpp" />
<ClCompile Include="PSX\GPURenderer.cpp" />
<ClCompile Include="PSX\GPURendererSW.cpp" />
<ClCompile Include="PSX\GPUSettingsDlg.cpp" />
<ClCompile Include="PSX\GPUSetupPrimCodeGenerator.cpp" />
<ClCompile Include="PSX\GPUState.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
@ -839,18 +839,6 @@
<ClInclude Include="config.h" />
<ClInclude Include="GLLoader.h" />
<ClInclude Include="GLState.h" />
<ClInclude Include="GPU.h" />
<ClInclude Include="GPUDrawingEnvironment.h" />
<ClInclude Include="GPUDrawScanline.h" />
<ClInclude Include="GPUDrawScanlineCodeGenerator.h" />
<ClInclude Include="GPULocalMemory.h" />
<ClInclude Include="GPURenderer.h" />
<ClInclude Include="GPURendererSW.h" />
<ClInclude Include="GPUScanlineEnvironment.h" />
<ClInclude Include="GPUSettingsDlg.h" />
<ClInclude Include="GPUSetupPrimCodeGenerator.h" />
<ClInclude Include="GPUState.h" />
<ClInclude Include="GPUVertex.h" />
<ClInclude Include="GS.h" />
<ClInclude Include="GSAlignedClass.h" />
<ClInclude Include="GSBlock.h" />
@ -920,6 +908,18 @@
<ClInclude Include="GSWnd.h" />
<ClInclude Include="GSWndDX.h" />
<ClInclude Include="GSWndWGL.h" />
<ClInclude Include="PSX\GPU.h" />
<ClInclude Include="PSX\GPUDrawingEnvironment.h" />
<ClInclude Include="PSX\GPUDrawScanline.h" />
<ClInclude Include="PSX\GPUDrawScanlineCodeGenerator.h" />
<ClInclude Include="PSX\GPULocalMemory.h" />
<ClInclude Include="PSX\GPURenderer.h" />
<ClInclude Include="PSX\GPURendererSW.h" />
<ClInclude Include="PSX\GPUScanlineEnvironment.h" />
<ClInclude Include="PSX\GPUSettingsDlg.h" />
<ClInclude Include="PSX\GPUSetupPrimCodeGenerator.h" />
<ClInclude Include="PSX\GPUState.h" />
<ClInclude Include="PSX\GPUVertex.h" />
<ClInclude Include="stdafx.h" />
<ClInclude Include="svnrev.h" />
<ClInclude Include="resource.h" />

126
plugins/GSdx/GSdx.vcxproj.filters
View File

@ -207,33 +207,6 @@
<ClCompile Include="GLState.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="GPU.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="GPUDrawScanline.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="GPUDrawScanlineCodeGenerator.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="GPULocalMemory.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="GPURenderer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="GPURendererSW.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="GPUSettingsDlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="GPUSetupPrimCodeGenerator.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="GPUState.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="GSDeviceDX.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@ -285,6 +258,33 @@
<ClCompile Include="GSPng.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="PSX\GPU.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="PSX\GPUDrawScanline.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="PSX\GPUDrawScanlineCodeGenerator.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="PSX\GPULocalMemory.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="PSX\GPURenderer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="PSX\GPURendererSW.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="PSX\GPUSettingsDlg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="PSX\GPUSetupPrimCodeGenerator.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="PSX\GPUState.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="GLLoader.h">
@ -506,42 +506,6 @@
<ClInclude Include="xbyak\xbyak_util.h">
<Filter>Xbyak</Filter>
</ClInclude>
<ClInclude Include="GPU.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="GPUDrawingEnvironment.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="GPUDrawScanline.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="GPUDrawScanlineCodeGenerator.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="GPULocalMemory.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="GPURenderer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="GPURendererSW.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="GPUScanlineEnvironment.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="GPUSettingsDlg.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="GPUSetupPrimCodeGenerator.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="GPUState.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="GPUVertex.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="GSTextureSW.h">
<Filter>Header Files</Filter>
</ClInclude>
@ -563,6 +527,42 @@
<ClInclude Include="GSPng.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="PSX\GPU.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="PSX\GPUDrawingEnvironment.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="PSX\GPUDrawScanline.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="PSX\GPUDrawScanlineCodeGenerator.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="PSX\GPULocalMemory.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="PSX\GPURenderer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="PSX\GPURendererSW.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="PSX\GPUScanlineEnvironment.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="PSX\GPUSettingsDlg.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="PSX\GPUSetupPrimCodeGenerator.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="PSX\GPUState.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="PSX\GPUVertex.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="res\logo10.bmp">

2
plugins/GSdx/GPU.cpp → plugins/GSdx/PSX/GPU.cpp
View File

@ -22,8 +22,8 @@
#include "stdafx.h"
#include "GSdx.h"
#include "GSUtil.h"
#include "GPURendererSW.h"
#include "GSDeviceNull.h"
#include "GPURendererSW.h"
#ifdef _WIN32

0
plugins/GSdx/GPU.h → plugins/GSdx/PSX/GPU.h
View File

0
plugins/GSdx/GPUDrawScanline.cpp → plugins/GSdx/PSX/GPUDrawScanline.cpp
View File

0
plugins/GSdx/GPUDrawScanline.h → plugins/GSdx/PSX/GPUDrawScanline.h
View File

0
plugins/GSdx/GPUDrawScanlineCodeGenerator.cpp → plugins/GSdx/PSX/GPUDrawScanlineCodeGenerator.cpp
View File

0
plugins/GSdx/GPUDrawScanlineCodeGenerator.h → plugins/GSdx/PSX/GPUDrawScanlineCodeGenerator.h
View File

0
plugins/GSdx/GPUDrawingEnvironment.h → plugins/GSdx/PSX/GPUDrawingEnvironment.h
View File

0
plugins/GSdx/GPULocalMemory.cpp → plugins/GSdx/PSX/GPULocalMemory.cpp
View File

0
plugins/GSdx/GPULocalMemory.h → plugins/GSdx/PSX/GPULocalMemory.h
View File

0
plugins/GSdx/GPURenderer.cpp → plugins/GSdx/PSX/GPURenderer.cpp
View File

0
plugins/GSdx/GPURenderer.h → plugins/GSdx/PSX/GPURenderer.h
View File

0
plugins/GSdx/GPURendererSW.cpp → plugins/GSdx/PSX/GPURendererSW.cpp
View File

0
plugins/GSdx/GPURendererSW.h → plugins/GSdx/PSX/GPURendererSW.h
View File

0
plugins/GSdx/GPUScanlineEnvironment.h → plugins/GSdx/PSX/GPUScanlineEnvironment.h
View File

4
plugins/GSdx/GPUSettingsDlg.cpp → plugins/GSdx/PSX/GPUSettingsDlg.cpp
View File

@ -21,10 +21,10 @@
#include "stdafx.h"
#include "GSdx.h"
#include "GPU.h"
#include "GSUtil.h"
#include "GPUSettingsDlg.h"
#include "resource.h"
#include "GPU.h"
#include "GPUSettingsDlg.h"
GPUSettingsDlg::GPUSettingsDlg()
: GSDialog(IDD_GPUCONFIG)

0
plugins/GSdx/GPUSettingsDlg.h → plugins/GSdx/PSX/GPUSettingsDlg.h
View File

0
plugins/GSdx/GPUSetupPrimCodeGenerator.cpp → plugins/GSdx/PSX/GPUSetupPrimCodeGenerator.cpp
View File

0
plugins/GSdx/GPUSetupPrimCodeGenerator.h → plugins/GSdx/PSX/GPUSetupPrimCodeGenerator.h
View File

0
plugins/GSdx/GPUState.cpp → plugins/GSdx/PSX/GPUState.cpp
View File

0
plugins/GSdx/GPUState.h → plugins/GSdx/PSX/GPUState.h
View File

0
plugins/GSdx/GPUVertex.h → plugins/GSdx/PSX/GPUVertex.h
View File

2
plugins/GSdx/vsprops/common.props
View File

@ -13,7 +13,7 @@
<WarningLevel>Level4</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4456;4458;4996;4995;4324;4100;4101;4201;4556;4127;4512;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<AdditionalIncludeDirectories>$(VTUNE_AMPLIFIER_XE_2015_DIR)include;$(SolutionDir)unfree;$(SolutionDir)3rdparty;$(SolutionDir)3rdparty\libpng;$(SolutionDir)3rdparty\opencl;$(SolutionDir)3rdparty\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(VTUNE_AMPLIFIER_XE_2015_DIR)include;$(ProjectDir);$(SolutionDir)unfree;$(SolutionDir)3rdparty;$(SolutionDir)3rdparty\libpng;$(SolutionDir)3rdparty\opencl;$(SolutionDir)3rdparty\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>