DX12 fix + rpcs3-tests project

cwirek91 · Oct 21, 2015 · d4e0da3 · d4e0da3
1 parent 8cfabf0
commit d4e0da3
Show file tree

Hide file tree

Showing 41 changed files with 404 additions and 1,299 deletions.
diff --git a/.gitignore b/.gitignore
@@ -70,6 +70,7 @@ rpcs3/git-version.h
 bin/dev_hdd0/*.txt
 x64/*
 rpcs3/x64/*
+rpcs3-tests/x64/*
 
 .DS_Store
 rpcs3/Emu/SysCalls/Modules/prx_*.h

diff --git a/bin/d3dcompiler_47.dll b/bin/d3dcompiler_47.dll
diff --git a/rpcs3-tests/ps3_syscall.cpp b/rpcs3-tests/ps3_syscall.cpp
@@ -0,0 +1,27 @@
+#include "stdafx.h"
+
+TEST_CLASS(UnitTest1)
+{
+	TEST_METHOD(TestMethod1)
+	{
+		setup_ps3_environment();
+	}
+
+	TEST_METHOD(TestMethod2)
+	{
+		// TODO: Your test code here
+	}
+};
+
+TEST_CLASS(UnitTest2)
+{
+	TEST_METHOD(TestMethod1)
+	{
+		// TODO: Your test code here
+	}
+
+	TEST_METHOD(TestMethod2)
+	{
+		// TODO: Your test code here
+	}
+};
diff --git a/rpcs3-tests/rpcs3-tests.vcxproj b/rpcs3-tests/rpcs3-tests.vcxproj
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{AB222E8A-00CA-4ACF-A87E-5251C16C0587}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>rpcs3tests</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)bin\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)bin\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\;..\rpcs3;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <UseFullPaths>true</UseFullPaths>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;..\OpenAL\libs\Win64;..\ffmpeg\Windows\x86_64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;OpenAL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>..\;..\rpcs3;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <UseFullPaths>true</UseFullPaths>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;..\OpenAL\libs\Win64;..\ffmpeg\Windows\x86_64\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;OpenAL32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="stdafx.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="stdafx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="ps3_syscall.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\asmjitsrc\asmjit.vcxproj">
+      <Project>{ac40ff01-426e-4838-a317-66354cefae88}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\rpcs3\emucore.vcxproj">
+      <Project>{c4a10229-4712-4bd2-b63e-50d93c67a038}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\wxWidgets\build\msw\wx_adv.vcxproj">
+      <Project>{24c45343-fd20-5c92-81c1-35a2ae841e79}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\wxWidgets\build\msw\wx_aui.vcxproj">
+      <Project>{a16d3832-0f42-57ce-8f48-50e06649ade8}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\wxWidgets\build\msw\wx_base.vcxproj">
+      <Project>{3fcc50c2-81e9-5db2-b8d8-2129427568b1}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\wxWidgets\build\msw\wx_core.vcxproj">
+      <Project>{6744dad8-9c70-574a-bff2-9f8dddb24a75}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\wxWidgets\build\msw\wx_gl.vcxproj">
+      <Project>{da8b15ef-6750-5928-bc0e-c748213cf9b2}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\wxWidgets\build\msw\wx_html.vcxproj">
+      <Project>{33cc42f9-7756-5587-863c-8d4461b7c5dd}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\wxWidgets\build\msw\wx_media.vcxproj">
+      <Project>{8bd8f8d9-4275-5b42-a8f4-f1db2970a550}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\wxWidgets\build\msw\wx_net.vcxproj">
+      <Project>{69f2ede4-7d21-5738-9bc0-f66f61c9ae00}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\wxWidgets\build\msw\wx_propgrid.vcxproj">
+      <Project>{97fdab45-9c58-5bc5-a2f4-ee42739ebc63}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\wxWidgets\build\msw\wx_qa.vcxproj">
+      <Project>{e21129e0-7c08-5936-9d8c-0d60b5319ba7}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\wxWidgets\build\msw\wx_ribbon.vcxproj">
+      <Project>{87b42a9c-3f5c-53d7-9017-2b1cae39457d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\wxWidgets\build\msw\wx_richtext.vcxproj">
+      <Project>{7fb0902d-8579-5dce-b883-daf66a885005}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\wxWidgets\build\msw\wx_stc.vcxproj">
+      <Project>{23e1c437-a951-5943-8639-a17f3cf2e606}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\wxWidgets\build\msw\wx_wxexpat.vcxproj">
+      <Project>{a1a8355b-0988-528e-9cc2-b971d6266669}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\wxWidgets\build\msw\wx_wxjpeg.vcxproj">
+      <Project>{6053cc38-cdee-584c-8bc8-4b000d800fc7}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\wxWidgets\build\msw\wx_wxpng.vcxproj">
+      <Project>{8acc122a-ca6a-5aa6-9c97-9cdd2e533db0}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\wxWidgets\build\msw\wx_wxregex.vcxproj">
+      <Project>{56a4b526-bb81-5d01-aaa9-16d23bbb169d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\wxWidgets\build\msw\wx_wxscintilla.vcxproj">
+      <Project>{74827ebd-93dc-5110-ba95-3f2ab029b6b0}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\wxWidgets\build\msw\wx_wxtiff.vcxproj">
+      <Project>{75596ce6-5ae7-55c9-b890-c07b0a657a83}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\wxWidgets\build\msw\wx_wxzlib.vcxproj">
+      <Project>{8b867186-a0b5-5479-b824-e176edd27c40}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\wxWidgets\build\msw\wx_xml.vcxproj">
+      <Project>{3e6dca27-5fa3-53ec-bbd6-2d42294b7ae6}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\wxWidgets\build\msw\wx_xrc.vcxproj">
+      <Project>{09f2f96a-1cc6-5e43-af1d-956ec2a4888d}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/rpcs3-tests/rpcs3-tests.vcxproj.filters b/rpcs3-tests/rpcs3-tests.vcxproj.filters
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>
+      </Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="stdafx.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ps3_syscall.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="stdafx.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
diff --git a/rpcs3-tests/rpcs3-tests.vcxproj.user b/rpcs3-tests/rpcs3-tests.vcxproj.user
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+</Project>
diff --git a/rpcs3-tests/stdafx.cpp b/rpcs3-tests/stdafx.cpp
@@ -0,0 +1 @@
+#include "stdafx.h"
diff --git a/rpcs3-tests/stdafx.h b/rpcs3-tests/stdafx.h
@@ -0,0 +1,24 @@
+#pragma once
+
+// Headers for CppUnitTest
+#include "CppUnitTest.h"
+
+using namespace Microsoft::VisualStudio::CppUnitTestFramework;
+
+// Use stdafx.h from emucore
+#include "../rpcs3/stdafx.h"
+
+#include <locale>
+#include <codecvt>
+
+#define TEST_LOG(text, ...) Microsoft::VisualStudio::CppUnitTestFramework::Logger::WriteMessage(fmt::format("%s (line %d): " text, __FUNCTION__, __LINE__, __VA_ARGS__).c_str())
+#define TEST_FAILURE(text, ...) Microsoft::VisualStudio::CppUnitTestFramework::Assert::Fail(std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>>().from_bytes(fmt::format(text, __VA_ARGS__)).c_str(), LINE_INFO())
+
+// Emulator environment
+#include "Emu/System.h"
+#include "Emu/Memory/Memory.h"
+
+static void setup_ps3_environment()
+{
+	vm::ps3::init();
+}