2016-02-21 18:50:49 +03:00
|
|
|
|
<?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 - LLVM|x64">
|
|
|
|
|
|
<Configuration>Debug - LLVM</Configuration>
|
|
|
|
|
|
<Platform>x64</Platform>
|
|
|
|
|
|
</ProjectConfiguration>
|
|
|
|
|
|
<ProjectConfiguration Include="Debug - MemLeak|x64">
|
|
|
|
|
|
<Configuration>Debug - MemLeak</Configuration>
|
|
|
|
|
|
<Platform>x64</Platform>
|
|
|
|
|
|
</ProjectConfiguration>
|
|
|
|
|
|
<ProjectConfiguration Include="Debug|x64">
|
|
|
|
|
|
<Configuration>Debug</Configuration>
|
|
|
|
|
|
<Platform>x64</Platform>
|
|
|
|
|
|
</ProjectConfiguration>
|
|
|
|
|
|
<ProjectConfiguration Include="Release - LLVM|x64">
|
|
|
|
|
|
<Configuration>Release - LLVM</Configuration>
|
|
|
|
|
|
<Platform>x64</Platform>
|
|
|
|
|
|
</ProjectConfiguration>
|
|
|
|
|
|
<ProjectConfiguration Include="Release|x64">
|
|
|
|
|
|
<Configuration>Release</Configuration>
|
|
|
|
|
|
<Platform>x64</Platform>
|
|
|
|
|
|
</ProjectConfiguration>
|
|
|
|
|
|
</ItemGroup>
|
|
|
|
|
|
<ItemGroup>
|
|
|
|
|
|
<ClInclude Include="Emu\RSX\VK\VKCommonDecompiler.h" />
|
2016-03-12 01:13:30 +01:00
|
|
|
|
<ClInclude Include="Emu\RSX\VK\VKFormats.h" />
|
2016-02-21 18:50:49 +03:00
|
|
|
|
<ClInclude Include="Emu\RSX\VK\VKFragmentProgram.h" />
|
|
|
|
|
|
<ClInclude Include="Emu\RSX\VK\VKGSRender.h" />
|
|
|
|
|
|
<ClInclude Include="Emu\RSX\VK\VKHelpers.h" />
|
2017-11-15 15:02:59 +03:00
|
|
|
|
<ClInclude Include="Emu\RSX\VK\VKOverlays.h" />
|
2016-02-21 18:50:49 +03:00
|
|
|
|
<ClInclude Include="Emu\RSX\VK\VKProgramBuffer.h" />
|
|
|
|
|
|
<ClInclude Include="Emu\RSX\VK\VKRenderTargets.h" />
|
2016-10-11 03:55:42 +03:00
|
|
|
|
<ClInclude Include="Emu\RSX\VK\VKTextOut.h" />
|
2016-02-21 18:50:49 +03:00
|
|
|
|
<ClInclude Include="Emu\RSX\VK\VKTextureCache.h" />
|
|
|
|
|
|
<ClInclude Include="Emu\RSX\VK\VKVertexProgram.h" />
|
|
|
|
|
|
<ClInclude Include="Emu\RSX\VK\VulkanAPI.h" />
|
|
|
|
|
|
</ItemGroup>
|
|
|
|
|
|
<ItemGroup>
|
|
|
|
|
|
<ClCompile Include="Emu\RSX\VK\VKCommonDecompiler.cpp" />
|
2016-03-12 01:13:30 +01:00
|
|
|
|
<ClCompile Include="Emu\RSX\VK\VKFormats.cpp" />
|
2016-02-21 18:50:49 +03:00
|
|
|
|
<ClCompile Include="Emu\RSX\VK\VKFragmentProgram.cpp" />
|
|
|
|
|
|
<ClCompile Include="Emu\RSX\VK\VKGSRender.cpp" />
|
|
|
|
|
|
<ClCompile Include="Emu\RSX\VK\VKHelpers.cpp" />
|
|
|
|
|
|
<ClCompile Include="Emu\RSX\VK\VKProgramPipeline.cpp" />
|
|
|
|
|
|
<ClCompile Include="Emu\RSX\VK\VKTexture.cpp" />
|
|
|
|
|
|
<ClCompile Include="Emu\RSX\VK\VKVertexBuffers.cpp" />
|
|
|
|
|
|
<ClCompile Include="Emu\RSX\VK\VKVertexProgram.cpp" />
|
|
|
|
|
|
<ClCompile Include="Emu\RSX\VK\VulkanAPI.cpp" />
|
|
|
|
|
|
</ItemGroup>
|
|
|
|
|
|
<ItemGroup>
|
|
|
|
|
|
<ProjectReference Include="emucore.vcxproj">
|
|
|
|
|
|
<Project>{c4a10229-4712-4bd2-b63e-50d93c67a038}</Project>
|
|
|
|
|
|
</ProjectReference>
|
|
|
|
|
|
</ItemGroup>
|
|
|
|
|
|
<PropertyGroup Label="Globals">
|
|
|
|
|
|
<ProjectGuid>{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}</ProjectGuid>
|
|
|
|
|
|
<Keyword>Win32Proj</Keyword>
|
|
|
|
|
|
<RootNamespace>VKGSRender</RootNamespace>
|
|
|
|
|
|
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
|
|
|
|
|
|
</PropertyGroup>
|
|
|
|
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
|
|
|
|
<PropertyGroup Label="Configuration">
|
|
|
|
|
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
|
|
|
|
<PlatformToolset>v140</PlatformToolset>
|
|
|
|
|
|
<CharacterSet>Unicode</CharacterSet>
|
|
|
|
|
|
</PropertyGroup>
|
|
|
|
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
|
|
|
|
<ImportGroup Label="ExtensionSettings">
|
|
|
|
|
|
</ImportGroup>
|
|
|
|
|
|
<ImportGroup Label="Shared">
|
|
|
|
|
|
</ImportGroup>
|
|
|
|
|
|
<ImportGroup Label="PropertySheets">
|
|
|
|
|
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
|
|
|
|
<Import Project="..\rpcs3_default.props" />
|
|
|
|
|
|
</ImportGroup>
|
|
|
|
|
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
|
|
|
|
<Import Project="..\rpcs3_debug.props" />
|
|
|
|
|
|
</ImportGroup>
|
|
|
|
|
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug - MemLeak|x64'" Label="PropertySheets">
|
|
|
|
|
|
<Import Project="..\rpcs3_debug.props" />
|
|
|
|
|
|
<Import Project="..\rpcs3_memleak.props" />
|
|
|
|
|
|
</ImportGroup>
|
|
|
|
|
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'" Label="PropertySheets">
|
|
|
|
|
|
<Import Project="..\rpcs3_debug.props" />
|
|
|
|
|
|
<Import Project="..\rpcs3_llvm.props" />
|
|
|
|
|
|
</ImportGroup>
|
|
|
|
|
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
|
|
|
|
<Import Project="..\rpcs3_release.props" />
|
|
|
|
|
|
</ImportGroup>
|
|
|
|
|
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'" Label="PropertySheets">
|
|
|
|
|
|
<Import Project="..\rpcs3_release.props" />
|
|
|
|
|
|
<Import Project="..\rpcs3_llvm.props" />
|
|
|
|
|
|
</ImportGroup>
|
|
|
|
|
|
<PropertyGroup Label="UserMacros" />
|
|
|
|
|
|
<PropertyGroup />
|
2016-02-02 00:40:38 +03:00
|
|
|
|
<ItemDefinitionGroup>
|
2016-02-21 18:50:49 +03:00
|
|
|
|
<ClCompile>
|
Fixes from FreeBSD package (#3765)
* Thread: unbreak on BSDs after dbc9bdfe02ae
Utilities/Thread.cpp:1920:2: error: unknown type name 'cpu_set_t'; did you mean 'cpusetid_t'?
cpu_set_t cs;
^~~~~~~~~
cpusetid_t
/usr/include/sys/types.h:84:22: note: 'cpusetid_t' declared here
typedef __cpusetid_t cpusetid_t;
^
Utilities/Thread.cpp:1921:2: error: use of undeclared identifier 'CPU_ZERO'
CPU_ZERO(&cs);
^
Utilities/Thread.cpp:1922:2: error: use of undeclared identifier 'CPU_SET'
CPU_SET(core, &cs);
^
Utilities/Thread.cpp:1923:48: error: unknown type name 'cpu_set_t'; did you mean 'cpusetid_t'?
pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cs);
^~~~~~~~~
cpusetid_t
* JIT: use MAP_32BIT on Linux and FreeBSD
Unless RLIMIT_DATA is low enough FreeBSD by default reserves lower 2Gb
for brk(2) style heap, ignoring mmap(2) address hint requested by RPCS3.
Passing MAP_32BIT fixes the following crash
Assertion failed: ((Type == ELF::R_X86_64_32 && (Value <= UINT32_MAX)) || (Type == ELF::R_X86_64_32S && ((int64_t)Value <= INT32_MAX && (int64_t)Value >= INT32_MIN))), function resolveX86_64Relocation, file /usr/ports/devel/llvm40/work/llvm-4.0.1.src/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp, line 287.
* build: unbreak -DVULKAN_PREBUILT with system glslang on Unix
rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:4:10: fatal error: '../../../../Vulkan/glslang/SPIRV/GlslangToSpv.h' file not found
#include "../../../../Vulkan/glslang/SPIRV/GlslangToSpv.h"
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
rpcs3/CMakeFiles/rpcs3.dir/Emu/RSX/VK/VKCommonDecompiler.cpp.o: In function `vk::compile_glsl_to_spv(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >&, glsl::program_domain, std::__1::vector<unsigned int, std::__1::allocator<unsigned int> >&)':
rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x50e): undefined reference to `glslang::TProgram::TProgram()'
rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x51d): undefined reference to `glslang::TShader::TShader(EShLanguage)'
rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x542): undefined reference to `glslang::TShader::setStrings(char const* const*, int)'
rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x581): undefined reference to `glslang::TShader::parse(TBuiltInResource const*, int, EProfile, bool, bool, EShMessages, glslang::TShader::Includer&)'
rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x5d6): undefined reference to `glslang::TProgram::link(EShMessages)'
rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x5f1): undefined reference to `glslang::GlslangToSpv(glslang::TIntermediate const&, std::__1::vector<unsigned int, std::__1::allocator<unsigned int> >&, glslang::SpvOptions*)'
rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x5ff): undefined reference to `glslang::TShader::getInfoLog()'
rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x61a): undefined reference to `glslang::TShader::getInfoDebugLog()'
rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x630): undefined reference to `glslang::TShader::~TShader()'
rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x63c): undefined reference to `glslang::TProgram::~TProgram()'
rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x6d2): undefined reference to `glslang::TShader::~TShader()'
rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x6de): undefined reference to `glslang::TProgram::~TProgram()'
rpcs3/CMakeFiles/rpcs3.dir/Emu/RSX/VK/VKCommonDecompiler.cpp.o: In function `vk::initialize_compiler_context()':
rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x6f5): undefined reference to `glslang::InitializeProcess()'
rpcs3/CMakeFiles/rpcs3.dir/Emu/RSX/VK/VKCommonDecompiler.cpp.o: In function `vk::finalize_compiler_context()':
rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp:(.text+0x856): undefined reference to `glslang::FinalizeProcess()'
* build/msvc: add missing glslang include directory after 6bb3f1b4d75c
"c:\projects\rpcs3\rpcs3\VKGSRender.vcxproj" (default target) (15) ->
(ClCompile target) ->
Emu\RSX\VK\VKCommonDecompiler.cpp(4): fatal error C1083: Cannot open include file: 'SPIRV/GlslangToSpv.h': No such file or directory [c:\projects\rpcs3\rpcs3\VKGSRender.vcxproj]
2017-11-20 21:56:25 +00:00
|
|
|
|
<AdditionalIncludeDirectories>..\Vulkan\Vulkan-LoaderAndValidationLayers\include;..\Vulkan\glslang\glslang\Public;..\Vulkan\glslang;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
2016-02-21 18:50:49 +03:00
|
|
|
|
</ClCompile>
|
|
|
|
|
|
</ItemDefinitionGroup>
|
|
|
|
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
|
|
|
|
<ImportGroup Label="ExtensionTargets">
|
|
|
|
|
|
</ImportGroup>
|
2017-11-15 15:02:59 +03:00
|
|
|
|
</Project>
|