Commit 73c3124c by Nicolas Capens Committed by Nicolas Capens

Fix Visual Studio build.

SPIRV-Tools include directory was missing, and all projects should link using the static runtime library. Bug b/123642959 Change-Id: I8ab915270115c810a91ff013d56a5bbb0a01d4a1 Reviewed-on: https://swiftshader-review.googlesource.com/c/24708Tested-by: 's avatarNicolas Capens <nicolascapens@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com>
parent 0f34a98a
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<PreferredToolArchitecture>x64</PreferredToolArchitecture> <PreferredToolArchitecture>x64</PreferredToolArchitecture>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{3978CAAD-F578-396F-B6DA-02E54873CA6A}</ProjectGuid> <ProjectGuid>{93979AE4-08B2-324E-AACE-6FFC302D2505}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<Platform>x64</Platform> <Platform>x64</Platform>
...@@ -68,112 +68,76 @@ ...@@ -68,112 +68,76 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\GLCompiler.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\GLCompiler.vcxproj">
<Project>{047A7872-884C-3C12-80D7-FCFF050028EB}</Project> <Project>{74318028-369F-3EA0-8A99-A341020416D6}</Project>
<Name>GLCompiler</Name> <Name>GLCompiler</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\OGLES2HelloAPI.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\OGLES2HelloAPI.vcxproj">
<Project>{88686241-535B-3351-BCC0-0FD605CADB7B}</Project> <Project>{14CBFE6C-4A95-3390-846D-C5B8E0B631CB}</Project>
<Name>OGLES2HelloAPI</Name> <Name>OGLES2HelloAPI</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\ReactorLLVM.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\ReactorLLVM.vcxproj">
<Project>{5ECCA9F3-BDF7-3269-9AE0-1EE596E7751A}</Project> <Project>{3E565C6C-4B64-3128-A009-4A91C77E00E5}</Project>
<Name>ReactorLLVM</Name> <Name>ReactorLLVM</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\ReactorUnitTests.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\ReactorUnitTests.vcxproj">
<Project>{AF18C8DD-B7B4-3A26-8CB4-AD6D01F259A3}</Project> <Project>{635B11E4-0F2D-368F-929C-945C5EF943FD}</Project>
<Name>ReactorUnitTests</Name> <Name>ReactorUnitTests</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\SPIRV-Tools.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\SPIRV-Tools.vcxproj">
<Project>{3E7F109C-4B35-3E20-A822-17E6AD235062}</Project> <Project>{EF1AF598-E402-38F1-A74A-35F18A1EC1CC}</Project>
<Name>SPIRV-Tools</Name> <Name>SPIRV-Tools</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\link\SPIRV-Tools-link.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\link\SPIRV-Tools-link.vcxproj">
<Project>{68834AD5-EAB1-379D-BD2B-1682FC06CAB6}</Project> <Project>{5F3076C6-2971-39DF-A3BE-A78FB0411AAE}</Project>
<Name>SPIRV-Tools-link</Name> <Name>SPIRV-Tools-link</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\opt\SPIRV-Tools-opt.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\opt\SPIRV-Tools-opt.vcxproj">
<Project>{B0B037D2-2FCD-36F3-B140-FAAEEC271424}</Project> <Project>{6ABDA7CD-3BBA-3190-AE38-B0BBE6CB9327}</Project>
<Name>SPIRV-Tools-opt</Name> <Name>SPIRV-Tools-opt</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\reduce\SPIRV-Tools-reduce.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\reduce\SPIRV-Tools-reduce.vcxproj">
<Project>{75611AE6-0325-3E59-8273-FF7FB44B94F7}</Project> <Project>{F6702FDF-019F-3B2F-9CAD-15C15CD4F871}</Project>
<Name>SPIRV-Tools-reduce</Name> <Name>SPIRV-Tools-reduce</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\SPIRV-Tools-shared.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\SPIRV-Tools-shared.vcxproj">
<Project>{C94EDFAF-90F6-3A9B-848C-E5FCBD1F5C4C}</Project> <Project>{62B58F28-8443-346E-8A29-F389A2C9CBAD}</Project>
<Name>SPIRV-Tools-shared</Name> <Name>SPIRV-Tools-shared</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\SwiftShader.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\SwiftShader.vcxproj">
<Project>{E0557C2F-3FD0-3856-8D9A-B7B2E2756E9B}</Project> <Project>{996E1D94-926B-3585-9466-CDB769D7188C}</Project>
<Name>SwiftShader</Name> <Name>SwiftShader</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\libEGL.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\libEGL.vcxproj">
<Project>{2E445C8F-6ADD-392A-89F9-6ED9DD702A33}</Project> <Project>{B49D30BB-AC67-3799-8A4E-B5F883BB229B}</Project>
<Name>libEGL</Name> <Name>libEGL</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\libGLES_CM.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\libGLES_CM.vcxproj">
<Project>{77C807B5-07FE-346C-9ED2-69EB8AFDE11F}</Project> <Project>{3915EFF3-638D-330F-BD1B-9E8D85D2FB1F}</Project>
<Name>libGLES_CM</Name> <Name>libGLES_CM</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\libGLESv2.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\libGLESv2.vcxproj">
<Project>{E830C9A7-C84E-3582-8CF8-260995751A36}</Project> <Project>{E22D780F-96F6-3714-B708-4875F7F8F6FF}</Project>
<Name>libGLESv2</Name> <Name>libGLESv2</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\libvk_swiftshader.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\libvk_swiftshader.vcxproj">
<Project>{1E30FEC0-63E8-3536-8F87-17632206F9E2}</Project> <Project>{32940355-6B50-33D6-BDC8-56E00F8D88BC}</Project>
<Name>libvk_swiftshader</Name> <Name>libvk_swiftshader</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\llvm.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\llvm.vcxproj">
<Project>{B44D8E62-2817-31C5-B7BB-FCF653D5AF44}</Project> <Project>{9B24984C-F78C-3EF7-907B-2B0D2CDB5695}</Project>
<Name>llvm</Name> <Name>llvm</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spirv-tools-pkg-config.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spirv-tools-pkg-config.vcxproj">
<Project>{4A218750-64B6-317F-BB39-6343D956CDFE}</Project> <Project>{EC5297D9-ED1C-3BE6-BF71-3D76CD9B2AA7}</Project>
<Name>spirv-tools-pkg-config</Name> <Name>spirv-tools-pkg-config</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spirv-tools-shared-pkg-config.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spirv-tools-shared-pkg-config.vcxproj">
<Project>{DC3E944C-5424-3F8B-B027-42D2C8D00D87}</Project> <Project>{0FA45296-9836-3DE4-BEA5-F2029797A16F}</Project>
<Name>spirv-tools-shared-pkg-config</Name> <Name>spirv-tools-shared-pkg-config</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\unittests.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\unittests.vcxproj">
<Project>{38D16894-006A-34D5-886C-E4C89169E935}</Project> <Project>{4BDD6A5B-67E0-33DF-950C-4AD0ABB1D729}</Project>
<Name>unittests</Name> <Name>unittests</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
</ItemGroup> </ItemGroup>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)src\OpenGL\compiler\AnalyzeCallDepth.cpp"> <ClCompile Include="$(SolutionDir)src\OpenGL\compiler\AnalyzeCallDepth.cpp">
...@@ -240,16 +240,16 @@ ...@@ -240,16 +240,16 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="src"> <Filter Include="src">
<UniqueIdentifier>{96A3A3C5-1BBA-3A3D-ADF6-3F1639D231D2}</UniqueIdentifier> <UniqueIdentifier>{13574A07-B880-3431-8401-B66983F72A05}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="src\OpenGL"> <Filter Include="src\OpenGL\compiler\preprocessor">
<UniqueIdentifier>{B51EB8AA-BF83-3BC6-A1FF-13DAC5584B2A}</UniqueIdentifier> <UniqueIdentifier>{9DCCFE59-E55F-37D1-B9F1-AC419B68ABFD}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="src\OpenGL\compiler"> <Filter Include="src\OpenGL\compiler">
<UniqueIdentifier>{CD6058C3-8BF7-38A3-92F5-32A22882191E}</UniqueIdentifier> <UniqueIdentifier>{AEE5967E-F68B-3972-BDE5-AF7D77265A4C}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="src\OpenGL\compiler\preprocessor"> <Filter Include="src\OpenGL">
<UniqueIdentifier>{2A23E6C7-90D4-306D-B43E-84817BB54DB7}</UniqueIdentifier> <UniqueIdentifier>{51160DCB-631F-348A-A69D-7F054A400827}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<PreferredToolArchitecture>x64</PreferredToolArchitecture> <PreferredToolArchitecture>x64</PreferredToolArchitecture>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{88686241-535B-3351-BCC0-0FD605CADB7B}</ProjectGuid> <ProjectGuid>{14CBFE6C-4A95-3390-846D-C5B8E0B631CB}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<Platform>x64</Platform> <Platform>x64</Platform>
...@@ -66,9 +66,8 @@ ...@@ -66,9 +66,8 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<UseFullPaths>false</UseFullPaths>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>WIN32;_WINDOWS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_WINDOWS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
...@@ -109,14 +108,12 @@ ...@@ -109,14 +108,12 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<UseFullPaths>false</UseFullPaths>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<DebugInformationFormat> <DebugInformationFormat></DebugInformationFormat>
</DebugInformationFormat>
</ClCompile> </ClCompile>
<ResourceCompile> <ResourceCompile>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
...@@ -145,44 +142,32 @@ ...@@ -145,44 +142,32 @@
</ProjectReference> </ProjectReference>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)third_party\PowerVR_SDK\Examples\Beginner\01_HelloAPI\OGLES2\OGLES2HelloAPI_Windows.cpp" /> <ClCompile Include="$(SolutionDir)third_party\PowerVR_SDK\Examples\Beginner\01_HelloAPI\OGLES2\OGLES2HelloAPI_Windows.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\GLCompiler.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\GLCompiler.vcxproj">
<Project>{047A7872-884C-3C12-80D7-FCFF050028EB}</Project> <Project>{74318028-369F-3EA0-8A99-A341020416D6}</Project>
<Name>GLCompiler</Name> <Name>GLCompiler</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\ReactorLLVM.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\ReactorLLVM.vcxproj">
<Project>{5ECCA9F3-BDF7-3269-9AE0-1EE596E7751A}</Project> <Project>{3E565C6C-4B64-3128-A009-4A91C77E00E5}</Project>
<Name>ReactorLLVM</Name> <Name>ReactorLLVM</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\SwiftShader.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\SwiftShader.vcxproj">
<Project>{E0557C2F-3FD0-3856-8D9A-B7B2E2756E9B}</Project> <Project>{996E1D94-926B-3585-9466-CDB769D7188C}</Project>
<Name>SwiftShader</Name> <Name>SwiftShader</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\libEGL.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\libEGL.vcxproj">
<Project>{2E445C8F-6ADD-392A-89F9-6ED9DD702A33}</Project> <Project>{B49D30BB-AC67-3799-8A4E-B5F883BB229B}</Project>
<Name>libEGL</Name> <Name>libEGL</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\libGLESv2.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\libGLESv2.vcxproj">
<Project>{E830C9A7-C84E-3582-8CF8-260995751A36}</Project> <Project>{E22D780F-96F6-3714-B708-4875F7F8F6FF}</Project>
<Name>libGLESv2</Name> <Name>libGLESv2</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\llvm.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\llvm.vcxproj">
<Project>{B44D8E62-2817-31C5-B7BB-FCF653D5AF44}</Project> <Project>{9B24984C-F78C-3EF7-907B-2B0D2CDB5695}</Project>
<Name>llvm</Name> <Name>llvm</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)third_party\PowerVR_SDK\Examples\Beginner\01_HelloAPI\OGLES2\OGLES2HelloAPI_Windows.cpp"> <ClCompile Include="$(SolutionDir)third_party\PowerVR_SDK\Examples\Beginner\01_HelloAPI\OGLES2\OGLES2HelloAPI_Windows.cpp">
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="Source Files"> <Filter Include="Source Files">
<UniqueIdentifier>{A1E75E1D-84CC-33C5-AED0-014DAD2C3788}</UniqueIdentifier> <UniqueIdentifier>{2F259CF2-FDFE-365E-920F-2228D7410C8D}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<PreferredToolArchitecture>x64</PreferredToolArchitecture> <PreferredToolArchitecture>x64</PreferredToolArchitecture>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{5ECCA9F3-BDF7-3269-9AE0-1EE596E7751A}</ProjectGuid> <ProjectGuid>{3E565C6C-4B64-3128-A009-4A91C77E00E5}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<Platform>x64</Platform> <Platform>x64</Platform>
...@@ -62,9 +62,8 @@ ...@@ -62,9 +62,8 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<UseFullPaths>false</UseFullPaths>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
...@@ -95,14 +94,12 @@ ...@@ -95,14 +94,12 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<UseFullPaths>false</UseFullPaths>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<DebugInformationFormat> <DebugInformationFormat></DebugInformationFormat>
</DebugInformationFormat>
</ClCompile> </ClCompile>
<ResourceCompile> <ResourceCompile>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
...@@ -121,27 +118,25 @@ ...@@ -121,27 +118,25 @@
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)src\Reactor\LLVMReactor.cpp" /> <ClCompile Include="$(SolutionDir)src\Reactor\LLVMReactor.cpp" />
<ClInclude Include="$(SolutionDir)src\Reactor\Nucleus.hpp" /> <ClInclude Include="$(SolutionDir)src\Reactor\Nucleus.hpp" />
<ClCompile Include="$(SolutionDir)src\Reactor\Routine.cpp" /> <ClCompile Include="$(SolutionDir)src\Reactor\Routine.cpp" />
<ClInclude Include="$(SolutionDir)src\Reactor\Routine.hpp" /> <ClInclude Include="$(SolutionDir)src\Reactor\Routine.hpp" />
<ClCompile Include="$(SolutionDir)src\Reactor\LLVMRoutine.cpp" /> <ClCompile Include="$(SolutionDir)src\Reactor\LLVMRoutine.cpp" />
<ClInclude Include="$(SolutionDir)src\Reactor\LLVMRoutine.hpp" /> <ClInclude Include="$(SolutionDir)src\Reactor\LLVMRoutine.hpp" />
<ClCompile Include="$(SolutionDir)src\Reactor\LLVMRoutineManager.cpp" /> <ClCompile Include="$(SolutionDir)src\Reactor\LLVMRoutineManager.cpp" />
<ClInclude Include="$(SolutionDir)src\Reactor\LLVMRoutineManager.hpp" /> <ClInclude Include="$(SolutionDir)src\Reactor\LLVMRoutineManager.hpp" />
<ClCompile Include="$(SolutionDir)src\Reactor\CPUID.cpp" /> <ClCompile Include="$(SolutionDir)src\Reactor\CPUID.cpp" />
<ClInclude Include="$(SolutionDir)src\Reactor\CPUID.hpp" /> <ClInclude Include="$(SolutionDir)src\Reactor\CPUID.hpp" />
<ClCompile Include="$(SolutionDir)src\Reactor\Debug.cpp" /> <ClCompile Include="$(SolutionDir)src\Reactor\Debug.cpp" />
<ClInclude Include="$(SolutionDir)src\Reactor\Debug.hpp" /> <ClInclude Include="$(SolutionDir)src\Reactor\Debug.hpp" />
<ClCompile Include="$(SolutionDir)src\Reactor\ExecutableMemory.cpp" /> <ClCompile Include="$(SolutionDir)src\Reactor\ExecutableMemory.cpp" />
<ClInclude Include="$(SolutionDir)src\Reactor\ExecutableMemory.hpp" /> <ClInclude Include="$(SolutionDir)src\Reactor\ExecutableMemory.hpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\llvm.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\llvm.vcxproj">
<Project>{B44D8E62-2817-31C5-B7BB-FCF653D5AF44}</Project> <Project>{9B24984C-F78C-3EF7-907B-2B0D2CDB5695}</Project>
<Name>llvm</Name> <Name>llvm</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)src\Reactor\LLVMReactor.cpp"> <ClCompile Include="$(SolutionDir)src\Reactor\LLVMReactor.cpp">
...@@ -47,11 +47,11 @@ ...@@ -47,11 +47,11 @@
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="src">
<UniqueIdentifier>{96A3A3C5-1BBA-3A3D-ADF6-3F1639D231D2}</UniqueIdentifier>
</Filter>
<Filter Include="src\Reactor"> <Filter Include="src\Reactor">
<UniqueIdentifier>{F2392387-E52C-34BB-A090-3378F8B608C0}</UniqueIdentifier> <UniqueIdentifier>{01629916-7B58-386F-9C49-915800FE4A05}</UniqueIdentifier>
</Filter>
<Filter Include="src">
<UniqueIdentifier>{13574A07-B880-3431-8401-B66983F72A05}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<PreferredToolArchitecture>x64</PreferredToolArchitecture> <PreferredToolArchitecture>x64</PreferredToolArchitecture>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{AF18C8DD-B7B4-3A26-8CB4-AD6D01F259A3}</ProjectGuid> <ProjectGuid>{635B11E4-0F2D-368F-929C-945C5EF943FD}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<Platform>x64</Platform> <Platform>x64</Platform>
...@@ -66,9 +66,8 @@ ...@@ -66,9 +66,8 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<UseFullPaths>false</UseFullPaths>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
...@@ -109,14 +108,12 @@ ...@@ -109,14 +108,12 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<UseFullPaths>false</UseFullPaths>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<DebugInformationFormat> <DebugInformationFormat></DebugInformationFormat>
</DebugInformationFormat>
</ClCompile> </ClCompile>
<ResourceCompile> <ResourceCompile>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
...@@ -145,21 +142,17 @@ ...@@ -145,21 +142,17 @@
</ProjectReference> </ProjectReference>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)src\Reactor\ReactorUnitTests.cpp" /> <ClCompile Include="$(SolutionDir)src\Reactor\ReactorUnitTests.cpp" />
<ClCompile Include="$(SolutionDir)third_party\googletest\googletest\src\gtest-all.cc" /> <ClCompile Include="$(SolutionDir)third_party\googletest\googletest\src\gtest-all.cc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\ReactorLLVM.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\ReactorLLVM.vcxproj">
<Project>{5ECCA9F3-BDF7-3269-9AE0-1EE596E7751A}</Project> <Project>{3E565C6C-4B64-3128-A009-4A91C77E00E5}</Project>
<Name>ReactorLLVM</Name> <Name>ReactorLLVM</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\llvm.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\llvm.vcxproj">
<Project>{B44D8E62-2817-31C5-B7BB-FCF653D5AF44}</Project> <Project>{9B24984C-F78C-3EF7-907B-2B0D2CDB5695}</Project>
<Name>llvm</Name> <Name>llvm</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)src\Reactor\ReactorUnitTests.cpp"> <ClCompile Include="$(SolutionDir)src\Reactor\ReactorUnitTests.cpp">
...@@ -9,14 +9,14 @@ ...@@ -9,14 +9,14 @@
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="src\Reactor">
<UniqueIdentifier>{01629916-7B58-386F-9C49-915800FE4A05}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files"> <Filter Include="Source Files">
<UniqueIdentifier>{A1E75E1D-84CC-33C5-AED0-014DAD2C3788}</UniqueIdentifier> <UniqueIdentifier>{2F259CF2-FDFE-365E-920F-2228D7410C8D}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="src"> <Filter Include="src">
<UniqueIdentifier>{96A3A3C5-1BBA-3A3D-ADF6-3F1639D231D2}</UniqueIdentifier> <UniqueIdentifier>{13574A07-B880-3431-8401-B66983F72A05}</UniqueIdentifier>
</Filter>
<Filter Include="src\Reactor">
<UniqueIdentifier>{F2392387-E52C-34BB-A090-3378F8B608C0}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)src\Common\CPUID.cpp"> <ClCompile Include="$(SolutionDir)src\Common\CPUID.cpp">
...@@ -144,6 +144,9 @@ ...@@ -144,6 +144,9 @@
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="$(SolutionDir)src\Common\Version.h">
<Filter>src\Common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\Common\CPUID.hpp"> <ClInclude Include="$(SolutionDir)src\Common\CPUID.hpp">
<Filter>src\Common</Filter> <Filter>src\Common</Filter>
</ClInclude> </ClInclude>
...@@ -183,9 +186,6 @@ ...@@ -183,9 +186,6 @@
<ClInclude Include="$(SolutionDir)src\Common\Types.hpp"> <ClInclude Include="$(SolutionDir)src\Common\Types.hpp">
<Filter>src\Common</Filter> <Filter>src\Common</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)src\Common\Version.h">
<Filter>src\Common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\Renderer\Blitter.hpp"> <ClInclude Include="$(SolutionDir)src\Renderer\Blitter.hpp">
<Filter>src\Renderer</Filter> <Filter>src\Renderer</Filter>
</ClInclude> </ClInclude>
...@@ -320,20 +320,20 @@ ...@@ -320,20 +320,20 @@
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="src">
<UniqueIdentifier>{96A3A3C5-1BBA-3A3D-ADF6-3F1639D231D2}</UniqueIdentifier>
</Filter>
<Filter Include="src\Common"> <Filter Include="src\Common">
<UniqueIdentifier>{8C957365-805D-3B54-ACD9-62917A45452A}</UniqueIdentifier> <UniqueIdentifier>{11C36704-F487-3E48-94BD-78A5C5D796BD}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="src\Main"> <Filter Include="src\Main">
<UniqueIdentifier>{36A866F1-859C-3157-AA9F-187E0E32538D}</UniqueIdentifier> <UniqueIdentifier>{3C9F38B6-307F-3432-AF88-723555B88F6E}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="src\Renderer"> <Filter Include="src\Renderer">
<UniqueIdentifier>{F73311CA-ECE8-3EB6-AA1B-4D2395A5DA9F}</UniqueIdentifier> <UniqueIdentifier>{5717B640-0503-3C5F-9414-3077EBFAFCB8}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="src\Shader"> <Filter Include="src\Shader">
<UniqueIdentifier>{5F64176E-50DD-3D7B-B221-BD3B3AA34E98}</UniqueIdentifier> <UniqueIdentifier>{2964277E-BF3D-3C43-9745-26D3BF41B62B}</UniqueIdentifier>
</Filter>
<Filter Include="src">
<UniqueIdentifier>{13574A07-B880-3431-8401-B66983F72A05}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<PreferredToolArchitecture>x64</PreferredToolArchitecture> <PreferredToolArchitecture>x64</PreferredToolArchitecture>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{2E445C8F-6ADD-392A-89F9-6ED9DD702A33}</ProjectGuid> <ProjectGuid>{B49D30BB-AC67-3799-8A4E-B5F883BB229B}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<Platform>x64</Platform> <Platform>x64</Platform>
...@@ -66,9 +66,8 @@ ...@@ -66,9 +66,8 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<UseFullPaths>false</UseFullPaths>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>WIN32;_WINDOWS;EGL_EGLEXT_PROTOTYPES; EGLAPI=; NO_SANITIZE_FUNCTION=;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR="Debug";libEGL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_WINDOWS;EGL_EGLEXT_PROTOTYPES; EGLAPI=; NO_SANITIZE_FUNCTION=;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR="Debug";libEGL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
...@@ -128,14 +127,12 @@ if %errorlevel% neq 0 goto :VCEnd</Command> ...@@ -128,14 +127,12 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<UseFullPaths>false</UseFullPaths>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;EGL_EGLEXT_PROTOTYPES; EGLAPI=; NO_SANITIZE_FUNCTION=;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR="Release";libEGL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;EGL_EGLEXT_PROTOTYPES; EGLAPI=; NO_SANITIZE_FUNCTION=;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR="Release";libEGL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<DebugInformationFormat> <DebugInformationFormat></DebugInformationFormat>
</DebugInformationFormat>
</ClCompile> </ClCompile>
<ResourceCompile> <ResourceCompile>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;EGL_EGLEXT_PROTOTYPES; EGLAPI=; NO_SANITIZE_FUNCTION=;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR=\"Release\";libEGL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;EGL_EGLEXT_PROTOTYPES; EGLAPI=; NO_SANITIZE_FUNCTION=;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR=\"Release\";libEGL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
...@@ -183,6 +180,27 @@ if %errorlevel% neq 0 goto :VCEnd</Command> ...@@ -183,6 +180,27 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
</ProjectReference> </ProjectReference>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)src\OpenGL\libEGL\Config.cpp" />
<ClCompile Include="$(SolutionDir)src\OpenGL\libEGL\Display.cpp" />
<ClCompile Include="$(SolutionDir)src\OpenGL\libEGL\Surface.cpp" />
<ClCompile Include="$(SolutionDir)src\OpenGL\libEGL\libEGL.cpp" />
<ClCompile Include="$(SolutionDir)src\OpenGL\libEGL\main.cpp" />
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\Config.h" />
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\Display.h" />
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\main.h" />
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\resource.h" />
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\Context.hpp" />
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\OSXUtils.hpp" />
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\Surface.hpp" />
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\Sync.hpp" />
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\Texture.hpp" />
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\libEGL.hpp" />
<ClCompile Include="$(SolutionDir)src\OpenGL\common\Object.cpp" />
<ClInclude Include="$(SolutionDir)src\OpenGL\common\Object.hpp" />
<ClCompile Include="$(SolutionDir)src\OpenGL\common\debug.cpp" />
<ClInclude Include="$(SolutionDir)src\OpenGL\common\debug.h" />
<ClCompile Include="$(SolutionDir)src\Common\SharedLibrary.cpp" />
<ClInclude Include="$(SolutionDir)src\Common\SharedLibrary.hpp" />
<ClInclude Include="$(SolutionDir)include\Android\android\api-level.h" /> <ClInclude Include="$(SolutionDir)include\Android\android\api-level.h" />
<ClInclude Include="$(SolutionDir)include\Android\android\sync.h" /> <ClInclude Include="$(SolutionDir)include\Android\android\sync.h" />
<ClInclude Include="$(SolutionDir)include\Android\cutils\native_handle.h" /> <ClInclude Include="$(SolutionDir)include\Android\cutils\native_handle.h" />
...@@ -229,28 +247,7 @@ if %errorlevel% neq 0 goto :VCEnd</Command> ...@@ -229,28 +247,7 @@ if %errorlevel% neq 0 goto :VCEnd</Command>
<ClInclude Include="$(SolutionDir)include\vulkan\vulkan_xcb.h" /> <ClInclude Include="$(SolutionDir)include\vulkan\vulkan_xcb.h" />
<ClInclude Include="$(SolutionDir)include\vulkan\vulkan_xlib.h" /> <ClInclude Include="$(SolutionDir)include\vulkan\vulkan_xlib.h" />
<ClInclude Include="$(SolutionDir)include\vulkan\vulkan_xlib_xrandr.h" /> <ClInclude Include="$(SolutionDir)include\vulkan\vulkan_xlib_xrandr.h" />
<ClCompile Include="$(SolutionDir)src\Common\SharedLibrary.cpp" /> <ResourceCompile Include="$(SolutionDir)src\OpenGL\libEGL\libEGL.rc" />
<ClInclude Include="$(SolutionDir)src\Common\SharedLibrary.hpp" />
<ClCompile Include="$(SolutionDir)src\OpenGL\common\Object.cpp" />
<ClInclude Include="$(SolutionDir)src\OpenGL\common\Object.hpp" />
<ClCompile Include="$(SolutionDir)src\OpenGL\common\debug.cpp" />
<ClInclude Include="$(SolutionDir)src\OpenGL\common\debug.h" />
<ClCompile Include="$(SolutionDir)src\OpenGL\libEGL\Config.cpp" />
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\Config.h" />
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\Context.hpp" />
<ClCompile Include="$(SolutionDir)src\OpenGL\libEGL\Display.cpp" />
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\Display.h" />
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\OSXUtils.hpp" />
<ClCompile Include="$(SolutionDir)src\OpenGL\libEGL\Surface.cpp" />
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\Surface.hpp" />
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\Sync.hpp" />
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\Texture.hpp" />
<ClCompile Include="$(SolutionDir)src\OpenGL\libEGL\libEGL.cpp" />
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\libEGL.hpp" />
<ClCompile Include="$(SolutionDir)src\OpenGL\libEGL\main.cpp" />
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\main.h" />
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\resource.h" />
<ResourceCompile Include="$(SolutionDir)src\OpenGL\libEGL\libEGL.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
</ItemGroup> </ItemGroup>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)src\Common\SharedLibrary.cpp">
<Filter>src\Common</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)src\OpenGL\common\Object.cpp">
<Filter>src\OpenGL\common</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)src\OpenGL\common\debug.cpp">
<Filter>src\OpenGL\common</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)src\OpenGL\libEGL\Config.cpp"> <ClCompile Include="$(SolutionDir)src\OpenGL\libEGL\Config.cpp">
<Filter>src\OpenGL\libEGL</Filter> <Filter>src\OpenGL\libEGL</Filter>
</ClCompile> </ClCompile>
...@@ -25,8 +16,56 @@ ...@@ -25,8 +16,56 @@
<ClCompile Include="$(SolutionDir)src\OpenGL\libEGL\main.cpp"> <ClCompile Include="$(SolutionDir)src\OpenGL\libEGL\main.cpp">
<Filter>src\OpenGL\libEGL</Filter> <Filter>src\OpenGL\libEGL</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(SolutionDir)src\OpenGL\common\Object.cpp">
<Filter>src\OpenGL\common</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)src\OpenGL\common\debug.cpp">
<Filter>src\OpenGL\common</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)src\Common\SharedLibrary.cpp">
<Filter>src\Common</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\Config.h">
<Filter>src\OpenGL\libEGL</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\Display.h">
<Filter>src\OpenGL\libEGL</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\main.h">
<Filter>src\OpenGL\libEGL</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\resource.h">
<Filter>src\OpenGL\libEGL</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\Context.hpp">
<Filter>src\OpenGL\libEGL</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\OSXUtils.hpp">
<Filter>src\OpenGL\libEGL</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\Surface.hpp">
<Filter>src\OpenGL\libEGL</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\Sync.hpp">
<Filter>src\OpenGL\libEGL</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\Texture.hpp">
<Filter>src\OpenGL\libEGL</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\libEGL.hpp">
<Filter>src\OpenGL\libEGL</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\Object.hpp">
<Filter>src\OpenGL\common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\debug.h">
<Filter>src\OpenGL\common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\Common\SharedLibrary.hpp">
<Filter>src\Common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)include\Android\android\api-level.h"> <ClInclude Include="$(SolutionDir)include\Android\android\api-level.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
...@@ -165,45 +204,6 @@ ...@@ -165,45 +204,6 @@
<ClInclude Include="$(SolutionDir)include\vulkan\vulkan_xlib_xrandr.h"> <ClInclude Include="$(SolutionDir)include\vulkan\vulkan_xlib_xrandr.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)src\Common\SharedLibrary.hpp">
<Filter>src\Common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\Object.hpp">
<Filter>src\OpenGL\common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\debug.h">
<Filter>src\OpenGL\common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\Config.h">
<Filter>src\OpenGL\libEGL</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\Context.hpp">
<Filter>src\OpenGL\libEGL</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\Display.h">
<Filter>src\OpenGL\libEGL</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\OSXUtils.hpp">
<Filter>src\OpenGL\libEGL</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\Surface.hpp">
<Filter>src\OpenGL\libEGL</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\Sync.hpp">
<Filter>src\OpenGL\libEGL</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\Texture.hpp">
<Filter>src\OpenGL\libEGL</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\libEGL.hpp">
<Filter>src\OpenGL\libEGL</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\main.h">
<Filter>src\OpenGL\libEGL</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libEGL\resource.h">
<Filter>src\OpenGL\libEGL</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="$(SolutionDir)src\OpenGL\libEGL\libEGL.rc"> <ResourceCompile Include="$(SolutionDir)src\OpenGL\libEGL\libEGL.rc">
...@@ -212,22 +212,22 @@ ...@@ -212,22 +212,22 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="Header Files"> <Filter Include="Header Files">
<UniqueIdentifier>{10CFD05B-A1B8-3F4E-B3C8-F65676382140}</UniqueIdentifier> <UniqueIdentifier>{06D2D69E-DE55-30BE-A8A1-FE6C66324860}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="src"> <Filter Include="src">
<UniqueIdentifier>{96A3A3C5-1BBA-3A3D-ADF6-3F1639D231D2}</UniqueIdentifier> <UniqueIdentifier>{13574A07-B880-3431-8401-B66983F72A05}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="src\Common"> <Filter Include="src\Common">
<UniqueIdentifier>{8C957365-805D-3B54-ACD9-62917A45452A}</UniqueIdentifier> <UniqueIdentifier>{11C36704-F487-3E48-94BD-78A5C5D796BD}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="src\OpenGL"> <Filter Include="src\OpenGL">
<UniqueIdentifier>{B51EB8AA-BF83-3BC6-A1FF-13DAC5584B2A}</UniqueIdentifier> <UniqueIdentifier>{51160DCB-631F-348A-A69D-7F054A400827}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="src\OpenGL\common"> <Filter Include="src\OpenGL\common">
<UniqueIdentifier>{FF3E87F8-2C8F-3E0C-A988-554EE10FA42E}</UniqueIdentifier> <UniqueIdentifier>{004AF498-11B5-3CDE-B8E3-7CCE434B2929}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="src\OpenGL\libEGL"> <Filter Include="src\OpenGL\libEGL">
<UniqueIdentifier>{12020D63-AB7C-3712-9006-C7176144D96A}</UniqueIdentifier> <UniqueIdentifier>{C37C965A-83A0-359C-B12C-21A1EAFCC071}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)src\Common\SharedLibrary.cpp">
<Filter>src\Common</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)src\OpenGL\common\Image.cpp">
<Filter>src\OpenGL\common</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)src\OpenGL\common\MatrixStack.cpp">
<Filter>src\OpenGL\common</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)src\OpenGL\common\Object.cpp">
<Filter>src\OpenGL\common</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)src\OpenGL\common\debug.cpp">
<Filter>src\OpenGL\common</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)src\OpenGL\libGLES_CM\Buffer.cpp"> <ClCompile Include="$(SolutionDir)src\OpenGL\libGLES_CM\Buffer.cpp">
<Filter>src\OpenGL\libGLES_CM</Filter> <Filter>src\OpenGL\libGLES_CM</Filter>
</ClCompile> </ClCompile>
...@@ -52,50 +37,29 @@ ...@@ -52,50 +37,29 @@
<ClCompile Include="$(SolutionDir)src\OpenGL\libGLES_CM\utilities.cpp"> <ClCompile Include="$(SolutionDir)src\OpenGL\libGLES_CM\utilities.cpp">
<Filter>src\OpenGL\libGLES_CM</Filter> <Filter>src\OpenGL\libGLES_CM</Filter>
</ClCompile> </ClCompile>
</ItemGroup> <ClCompile Include="$(SolutionDir)src\OpenGL\common\Image.cpp">
<ItemGroup>
<ClInclude Include="$(SolutionDir)include\GLES\gl.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)include\GLES\glext.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)include\GLES\glplatform.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)include\KHR\khrplatform.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\Common\SharedLibrary.hpp">
<Filter>src\Common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\Image.hpp">
<Filter>src\OpenGL\common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\MatrixStack.hpp">
<Filter>src\OpenGL\common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\NameSpace.hpp">
<Filter>src\OpenGL\common</Filter> <Filter>src\OpenGL\common</Filter>
</ClInclude> </ClCompile>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\Object.hpp"> <ClCompile Include="$(SolutionDir)src\OpenGL\common\MatrixStack.cpp">
<Filter>src\OpenGL\common</Filter> <Filter>src\OpenGL\common</Filter>
</ClInclude> </ClCompile>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\Surface.hpp"> <ClCompile Include="$(SolutionDir)src\OpenGL\common\Object.cpp">
<Filter>src\OpenGL\common</Filter> <Filter>src\OpenGL\common</Filter>
</ClInclude> </ClCompile>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\debug.h"> <ClCompile Include="$(SolutionDir)src\OpenGL\common\debug.cpp">
<Filter>src\OpenGL\common</Filter> <Filter>src\OpenGL\common</Filter>
</ClInclude> </ClCompile>
<ClCompile Include="$(SolutionDir)src\Common\SharedLibrary.cpp">
<Filter>src\Common</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(SolutionDir)src\OpenGL\libGLES_CM\Buffer.h"> <ClInclude Include="$(SolutionDir)src\OpenGL\libGLES_CM\Buffer.h">
<Filter>src\OpenGL\libGLES_CM</Filter> <Filter>src\OpenGL\libGLES_CM</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libGLES_CM\Context.h"> <ClInclude Include="$(SolutionDir)src\OpenGL\libGLES_CM\Context.h">
<Filter>src\OpenGL\libGLES_CM</Filter> <Filter>src\OpenGL\libGLES_CM</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libGLES_CM\Device.hpp">
<Filter>src\OpenGL\libGLES_CM</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libGLES_CM\Framebuffer.h"> <ClInclude Include="$(SolutionDir)src\OpenGL\libGLES_CM\Framebuffer.h">
<Filter>src\OpenGL\libGLES_CM</Filter> <Filter>src\OpenGL\libGLES_CM</Filter>
</ClInclude> </ClInclude>
...@@ -114,9 +78,6 @@ ...@@ -114,9 +78,6 @@
<ClInclude Include="$(SolutionDir)src\OpenGL\libGLES_CM\VertexDataManager.h"> <ClInclude Include="$(SolutionDir)src\OpenGL\libGLES_CM\VertexDataManager.h">
<Filter>src\OpenGL\libGLES_CM</Filter> <Filter>src\OpenGL\libGLES_CM</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libGLES_CM\libGLES_CM.hpp">
<Filter>src\OpenGL\libGLES_CM</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libGLES_CM\main.h"> <ClInclude Include="$(SolutionDir)src\OpenGL\libGLES_CM\main.h">
<Filter>src\OpenGL\libGLES_CM</Filter> <Filter>src\OpenGL\libGLES_CM</Filter>
</ClInclude> </ClInclude>
...@@ -129,6 +90,45 @@ ...@@ -129,6 +90,45 @@
<ClInclude Include="$(SolutionDir)src\OpenGL\libGLES_CM\utilities.h"> <ClInclude Include="$(SolutionDir)src\OpenGL\libGLES_CM\utilities.h">
<Filter>src\OpenGL\libGLES_CM</Filter> <Filter>src\OpenGL\libGLES_CM</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libGLES_CM\Device.hpp">
<Filter>src\OpenGL\libGLES_CM</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libGLES_CM\libGLES_CM.hpp">
<Filter>src\OpenGL\libGLES_CM</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\debug.h">
<Filter>src\OpenGL\common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\Image.hpp">
<Filter>src\OpenGL\common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\MatrixStack.hpp">
<Filter>src\OpenGL\common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\NameSpace.hpp">
<Filter>src\OpenGL\common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\Object.hpp">
<Filter>src\OpenGL\common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\Surface.hpp">
<Filter>src\OpenGL\common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\Common\SharedLibrary.hpp">
<Filter>src\Common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)include\KHR\khrplatform.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)include\GLES\gl.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)include\GLES\glext.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)include\GLES\glplatform.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="$(SolutionDir)src\OpenGL\libGLES_CM\libGLES_CM.rc"> <ResourceCompile Include="$(SolutionDir)src\OpenGL\libGLES_CM\libGLES_CM.rc">
...@@ -136,23 +136,23 @@ ...@@ -136,23 +136,23 @@
</ResourceCompile> </ResourceCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="src\OpenGL\common">
<UniqueIdentifier>{004AF498-11B5-3CDE-B8E3-7CCE434B2929}</UniqueIdentifier>
</Filter>
<Filter Include="src\OpenGL\libGLES_CM">
<UniqueIdentifier>{59A27B28-963D-3B21-9F87-062C74160C7D}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files"> <Filter Include="Header Files">
<UniqueIdentifier>{10CFD05B-A1B8-3F4E-B3C8-F65676382140}</UniqueIdentifier> <UniqueIdentifier>{06D2D69E-DE55-30BE-A8A1-FE6C66324860}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="src"> <Filter Include="src">
<UniqueIdentifier>{96A3A3C5-1BBA-3A3D-ADF6-3F1639D231D2}</UniqueIdentifier> <UniqueIdentifier>{13574A07-B880-3431-8401-B66983F72A05}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="src\Common"> <Filter Include="src\Common">
<UniqueIdentifier>{8C957365-805D-3B54-ACD9-62917A45452A}</UniqueIdentifier> <UniqueIdentifier>{11C36704-F487-3E48-94BD-78A5C5D796BD}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="src\OpenGL"> <Filter Include="src\OpenGL">
<UniqueIdentifier>{B51EB8AA-BF83-3BC6-A1FF-13DAC5584B2A}</UniqueIdentifier> <UniqueIdentifier>{51160DCB-631F-348A-A69D-7F054A400827}</UniqueIdentifier>
</Filter>
<Filter Include="src\OpenGL\common">
<UniqueIdentifier>{FF3E87F8-2C8F-3E0C-A988-554EE10FA42E}</UniqueIdentifier>
</Filter>
<Filter Include="src\OpenGL\libGLES_CM">
<UniqueIdentifier>{F7FFB82F-840F-3A27-A40B-67BC3E3AFAE4}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)src\Common\SharedLibrary.cpp">
<Filter>src\Common</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)src\OpenGL\common\Image.cpp">
<Filter>src\OpenGL\common</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)src\OpenGL\common\MatrixStack.cpp">
<Filter>src\OpenGL\common</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)src\OpenGL\common\Object.cpp">
<Filter>src\OpenGL\common</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)src\OpenGL\common\debug.cpp">
<Filter>src\OpenGL\common</Filter>
</ClCompile>
<ClCompile Include="$(SolutionDir)src\OpenGL\libGLESv2\Buffer.cpp"> <ClCompile Include="$(SolutionDir)src\OpenGL\libGLESv2\Buffer.cpp">
<Filter>src\OpenGL\libGLESv2</Filter> <Filter>src\OpenGL\libGLESv2</Filter>
</ClCompile> </ClCompile>
...@@ -76,56 +61,29 @@ ...@@ -76,56 +61,29 @@
<ClCompile Include="$(SolutionDir)src\OpenGL\libGLESv2\utilities.cpp"> <ClCompile Include="$(SolutionDir)src\OpenGL\libGLESv2\utilities.cpp">
<Filter>src\OpenGL\libGLESv2</Filter> <Filter>src\OpenGL\libGLESv2</Filter>
</ClCompile> </ClCompile>
</ItemGroup> <ClCompile Include="$(SolutionDir)src\OpenGL\common\Image.cpp">
<ItemGroup>
<ClInclude Include="$(SolutionDir)include\GLES2\gl2.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)include\GLES2\gl2ext.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)include\GLES2\gl2platform.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)include\GLES3\gl3.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)include\GLES3\gl3platform.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)include\KHR\khrplatform.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\Common\SharedLibrary.hpp">
<Filter>src\Common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\Image.hpp">
<Filter>src\OpenGL\common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\MatrixStack.hpp">
<Filter>src\OpenGL\common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\NameSpace.hpp">
<Filter>src\OpenGL\common</Filter> <Filter>src\OpenGL\common</Filter>
</ClInclude> </ClCompile>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\Object.hpp"> <ClCompile Include="$(SolutionDir)src\OpenGL\common\MatrixStack.cpp">
<Filter>src\OpenGL\common</Filter> <Filter>src\OpenGL\common</Filter>
</ClInclude> </ClCompile>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\Surface.hpp"> <ClCompile Include="$(SolutionDir)src\OpenGL\common\Object.cpp">
<Filter>src\OpenGL\common</Filter> <Filter>src\OpenGL\common</Filter>
</ClInclude> </ClCompile>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\debug.h"> <ClCompile Include="$(SolutionDir)src\OpenGL\common\debug.cpp">
<Filter>src\OpenGL\common</Filter> <Filter>src\OpenGL\common</Filter>
</ClInclude> </ClCompile>
<ClCompile Include="$(SolutionDir)src\Common\SharedLibrary.cpp">
<Filter>src\Common</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(SolutionDir)src\OpenGL\libGLESv2\Buffer.h"> <ClInclude Include="$(SolutionDir)src\OpenGL\libGLESv2\Buffer.h">
<Filter>src\OpenGL\libGLESv2</Filter> <Filter>src\OpenGL\libGLESv2</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libGLESv2\Context.h"> <ClInclude Include="$(SolutionDir)src\OpenGL\libGLESv2\Context.h">
<Filter>src\OpenGL\libGLESv2</Filter> <Filter>src\OpenGL\libGLESv2</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libGLESv2\Device.hpp">
<Filter>src\OpenGL\libGLESv2</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libGLESv2\Fence.h"> <ClInclude Include="$(SolutionDir)src\OpenGL\libGLESv2\Fence.h">
<Filter>src\OpenGL\libGLESv2</Filter> <Filter>src\OpenGL\libGLESv2</Filter>
</ClInclude> </ClInclude>
...@@ -168,9 +126,6 @@ ...@@ -168,9 +126,6 @@
<ClInclude Include="$(SolutionDir)src\OpenGL\libGLESv2\entry_points.h"> <ClInclude Include="$(SolutionDir)src\OpenGL\libGLESv2\entry_points.h">
<Filter>src\OpenGL\libGLESv2</Filter> <Filter>src\OpenGL\libGLESv2</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libGLESv2\libGLESv2.hpp">
<Filter>src\OpenGL\libGLESv2</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libGLESv2\main.h"> <ClInclude Include="$(SolutionDir)src\OpenGL\libGLESv2\main.h">
<Filter>src\OpenGL\libGLESv2</Filter> <Filter>src\OpenGL\libGLESv2</Filter>
</ClInclude> </ClInclude>
...@@ -183,6 +138,51 @@ ...@@ -183,6 +138,51 @@
<ClInclude Include="$(SolutionDir)src\OpenGL\libGLESv2\utilities.h"> <ClInclude Include="$(SolutionDir)src\OpenGL\libGLESv2\utilities.h">
<Filter>src\OpenGL\libGLESv2</Filter> <Filter>src\OpenGL\libGLESv2</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libGLESv2\Device.hpp">
<Filter>src\OpenGL\libGLESv2</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\libGLESv2\libGLESv2.hpp">
<Filter>src\OpenGL\libGLESv2</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\debug.h">
<Filter>src\OpenGL\common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\Image.hpp">
<Filter>src\OpenGL\common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\MatrixStack.hpp">
<Filter>src\OpenGL\common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\NameSpace.hpp">
<Filter>src\OpenGL\common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\Object.hpp">
<Filter>src\OpenGL\common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\OpenGL\common\Surface.hpp">
<Filter>src\OpenGL\common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)src\Common\SharedLibrary.hpp">
<Filter>src\Common</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)include\KHR\khrplatform.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)include\GLES2\gl2.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)include\GLES2\gl2ext.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)include\GLES2\gl2platform.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)include\GLES3\gl3.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="$(SolutionDir)include\GLES3\gl3platform.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="$(SolutionDir)src\OpenGL\libGLESv2\libGLESv2.rc"> <ResourceCompile Include="$(SolutionDir)src\OpenGL\libGLESv2\libGLESv2.rc">
...@@ -191,22 +191,22 @@ ...@@ -191,22 +191,22 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="Header Files"> <Filter Include="Header Files">
<UniqueIdentifier>{10CFD05B-A1B8-3F4E-B3C8-F65676382140}</UniqueIdentifier> <UniqueIdentifier>{06D2D69E-DE55-30BE-A8A1-FE6C66324860}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="src"> <Filter Include="src">
<UniqueIdentifier>{96A3A3C5-1BBA-3A3D-ADF6-3F1639D231D2}</UniqueIdentifier> <UniqueIdentifier>{13574A07-B880-3431-8401-B66983F72A05}</UniqueIdentifier>
</Filter>
<Filter Include="src\Common">
<UniqueIdentifier>{8C957365-805D-3B54-ACD9-62917A45452A}</UniqueIdentifier>
</Filter>
<Filter Include="src\OpenGL">
<UniqueIdentifier>{B51EB8AA-BF83-3BC6-A1FF-13DAC5584B2A}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="src\OpenGL\common"> <Filter Include="src\OpenGL\common">
<UniqueIdentifier>{FF3E87F8-2C8F-3E0C-A988-554EE10FA42E}</UniqueIdentifier> <UniqueIdentifier>{004AF498-11B5-3CDE-B8E3-7CCE434B2929}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="src\OpenGL\libGLESv2"> <Filter Include="src\OpenGL\libGLESv2">
<UniqueIdentifier>{27666A0E-6133-37AF-9D87-9DAFC77D92F5}</UniqueIdentifier> <UniqueIdentifier>{C5E9F0D5-53EB-36BA-9599-94F75E21EAFB}</UniqueIdentifier>
</Filter>
<Filter Include="src\Common">
<UniqueIdentifier>{11C36704-F487-3E48-94BD-78A5C5D796BD}</UniqueIdentifier>
</Filter>
<Filter Include="src\OpenGL">
<UniqueIdentifier>{51160DCB-631F-348A-A69D-7F054A400827}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
This source diff could not be displayed because it is too large. You can view the blob instead.
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\AliasAnalysis.cpp"> <ClCompile Include="$(SolutionDir)third_party\llvm-7.0\llvm\lib\Analysis\AliasAnalysis.cpp">
...@@ -2608,7 +2608,7 @@ ...@@ -2608,7 +2608,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="Source Files"> <Filter Include="Source Files">
<UniqueIdentifier>{A1E75E1D-84CC-33C5-AED0-014DAD2C3788}</UniqueIdentifier> <UniqueIdentifier>{2F259CF2-FDFE-365E-920F-2228D7410C8D}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<PreferredToolArchitecture>x64</PreferredToolArchitecture> <PreferredToolArchitecture>x64</PreferredToolArchitecture>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{3978CAAD-F578-396F-B6DA-02E54873CA6A}</ProjectGuid> <ProjectGuid>{93979AE4-08B2-324E-AACE-6FFC302D2505}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<Platform>x64</Platform> <Platform>x64</Platform>
...@@ -68,46 +68,32 @@ ...@@ -68,46 +68,32 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\SPIRV-Tools.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\SPIRV-Tools.vcxproj">
<Project>{3E7F109C-4B35-3E20-A822-17E6AD235062}</Project> <Project>{EF1AF598-E402-38F1-A74A-35F18A1EC1CC}</Project>
<Name>SPIRV-Tools</Name> <Name>SPIRV-Tools</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\link\SPIRV-Tools-link.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\link\SPIRV-Tools-link.vcxproj">
<Project>{68834AD5-EAB1-379D-BD2B-1682FC06CAB6}</Project> <Project>{5F3076C6-2971-39DF-A3BE-A78FB0411AAE}</Project>
<Name>SPIRV-Tools-link</Name> <Name>SPIRV-Tools-link</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\opt\SPIRV-Tools-opt.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\opt\SPIRV-Tools-opt.vcxproj">
<Project>{B0B037D2-2FCD-36F3-B140-FAAEEC271424}</Project> <Project>{6ABDA7CD-3BBA-3190-AE38-B0BBE6CB9327}</Project>
<Name>SPIRV-Tools-opt</Name> <Name>SPIRV-Tools-opt</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\reduce\SPIRV-Tools-reduce.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\reduce\SPIRV-Tools-reduce.vcxproj">
<Project>{75611AE6-0325-3E59-8273-FF7FB44B94F7}</Project> <Project>{F6702FDF-019F-3B2F-9CAD-15C15CD4F871}</Project>
<Name>SPIRV-Tools-reduce</Name> <Name>SPIRV-Tools-reduce</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\SPIRV-Tools-shared.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\SPIRV-Tools-shared.vcxproj">
<Project>{C94EDFAF-90F6-3A9B-848C-E5FCBD1F5C4C}</Project> <Project>{62B58F28-8443-346E-8A29-F389A2C9CBAD}</Project>
<Name>SPIRV-Tools-shared</Name> <Name>SPIRV-Tools-shared</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spirv-tools-pkg-config.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spirv-tools-pkg-config.vcxproj">
<Project>{4A218750-64B6-317F-BB39-6343D956CDFE}</Project> <Project>{EC5297D9-ED1C-3BE6-BF71-3D76CD9B2AA7}</Project>
<Name>spirv-tools-pkg-config</Name> <Name>spirv-tools-pkg-config</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spirv-tools-shared-pkg-config.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spirv-tools-shared-pkg-config.vcxproj">
<Project>{DC3E944C-5424-3F8B-B027-42D2C8D00D87}</Project> <Project>{0FA45296-9836-3DE4-BEA5-F2029797A16F}</Project>
<Name>spirv-tools-shared-pkg-config</Name> <Name>spirv-tools-shared-pkg-config</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
</ItemGroup> </ItemGroup>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\util\bit_vector.cpp"> <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\util\bit_vector.cpp">
...@@ -326,19 +326,70 @@ ...@@ -326,19 +326,70 @@
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\f489efd2b4222d1206a4508497d54f91\build-version.inc.rule"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\extension_enum.inc.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\core.insts-unified1.inc.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\generators.inc.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\opencl.std.insts.inc.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\glsl.std.450.insts.inc.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\spv-amd-shader-explicit-vertex-parameter.insts.inc.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-spv-amd-shader-explicit-vertex-parameter.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\spv-amd-shader-trinary-minmax.insts.inc.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-spv-amd-shader-trinary-minmax.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\spv-amd-gcn-shader.insts.inc.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-spv-amd-gcn-shader.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\spv-amd-shader-ballot.insts.inc.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-spv-amd-shader-ballot.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\debuginfo.insts.inc.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-debuginfo.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\DebugInfo.h.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-header-DebugInfo.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\build-version.inc.rule">
<Filter>CMake Rules</Filter> <Filter>CMake Rules</Filter>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="CMake Rules"> <Filter Include="Source Files">
<UniqueIdentifier>{5EE6D6AB-26DF-38FF-B736-7FAA511DFF82}</UniqueIdentifier> <UniqueIdentifier>{2F259CF2-FDFE-365E-920F-2228D7410C8D}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Header Files"> <Filter Include="Header Files">
<UniqueIdentifier>{10CFD05B-A1B8-3F4E-B3C8-F65676382140}</UniqueIdentifier> <UniqueIdentifier>{06D2D69E-DE55-30BE-A8A1-FE6C66324860}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Source Files"> <Filter Include="CMake Rules">
<UniqueIdentifier>{A1E75E1D-84CC-33C5-AED0-014DAD2C3788}</UniqueIdentifier> <UniqueIdentifier>{E7120DB7-422E-375E-9E9C-67A8C10F86DB}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
This source diff could not be displayed because it is too large. You can view the blob instead.
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\util\bit_vector.cpp"> <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\util\bit_vector.cpp">
...@@ -326,19 +326,70 @@ ...@@ -326,19 +326,70 @@
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\f489efd2b4222d1206a4508497d54f91\build-version.inc.rule"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\extension_enum.inc.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\core.insts-unified1.inc.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\generators.inc.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\opencl.std.insts.inc.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\glsl.std.450.insts.inc.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\spv-amd-shader-explicit-vertex-parameter.insts.inc.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-spv-amd-shader-explicit-vertex-parameter.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\spv-amd-shader-trinary-minmax.insts.inc.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-spv-amd-shader-trinary-minmax.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\spv-amd-gcn-shader.insts.inc.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-spv-amd-gcn-shader.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\spv-amd-shader-ballot.insts.inc.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-spv-amd-shader-ballot.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\debuginfo.insts.inc.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-debuginfo.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\DebugInfo.h.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-header-DebugInfo.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\build-version.inc.rule">
<Filter>CMake Rules</Filter> <Filter>CMake Rules</Filter>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="CMake Rules"> <Filter Include="Source Files">
<UniqueIdentifier>{5EE6D6AB-26DF-38FF-B736-7FAA511DFF82}</UniqueIdentifier> <UniqueIdentifier>{2F259CF2-FDFE-365E-920F-2228D7410C8D}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Header Files"> <Filter Include="Header Files">
<UniqueIdentifier>{10CFD05B-A1B8-3F4E-B3C8-F65676382140}</UniqueIdentifier> <UniqueIdentifier>{06D2D69E-DE55-30BE-A8A1-FE6C66324860}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Source Files"> <Filter Include="CMake Rules">
<UniqueIdentifier>{A1E75E1D-84CC-33C5-AED0-014DAD2C3788}</UniqueIdentifier> <UniqueIdentifier>{E7120DB7-422E-375E-9E9C-67A8C10F86DB}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json" /> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\core.insts-unified1.inc.rule">
<CustomBuild Include="$(SolutionDir)third_party\SPIRV-Headers\include\spirv\spir-v.xml" /> <Filter>CMake Rules</Filter>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\fa8e48db237811ef620e7518b63250dd\core_tables.rule"> </CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\generators.inc.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\core_tables.rule">
<Filter>CMake Rules</Filter> <Filter>CMake Rules</Filter>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
...@@ -12,7 +16,7 @@ ...@@ -12,7 +16,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="CMake Rules"> <Filter Include="CMake Rules">
<UniqueIdentifier>{5EE6D6AB-26DF-38FF-B736-7FAA511DFF82}</UniqueIdentifier> <UniqueIdentifier>{E7120DB7-422E-375E-9E9C-67A8C10F86DB}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<PreferredToolArchitecture>x64</PreferredToolArchitecture> <PreferredToolArchitecture>x64</PreferredToolArchitecture>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{1F3D5E8B-07BC-3A2F-B4EB-8FEBC5819813}</ProjectGuid> <ProjectGuid>{878391C5-E52B-3DC9-AA48-92D3EB99C2EE}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<Platform>x64</Platform> <Platform>x64</Platform>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</Midl> </Midl>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\extension_enum.inc"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\extension_enum.inc.rule">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate enum-string mapping for SPIR-V vunified1.</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate enum-string mapping for SPIR-V vunified1.</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_grammar_tables.py --spirv-core-grammar=$(SolutionDir)third_party/SPIRV-Headers/include/spirv/unified1/spirv.core.grammar.json --extinst-debuginfo-grammar=$(SolutionDir)third_party/SPIRV-Tools/source/extinst.debuginfo.grammar.json "--extension-enum-output=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/extension_enum.inc" "--enum-string-mapping-output=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/enum_string_mapping.inc" python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_grammar_tables.py --spirv-core-grammar=$(SolutionDir)third_party/SPIRV-Headers/include/spirv/unified1/spirv.core.grammar.json --extinst-debuginfo-grammar=$(SolutionDir)third_party/SPIRV-Tools/source/extinst.debuginfo.grammar.json "--extension-enum-output=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/extension_enum.inc" "--enum-string-mapping-output=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/enum_string_mapping.inc"
...@@ -76,7 +76,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -76,7 +76,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/extension_enum.inc;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\extension_enum.inc;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/d839d777cdb37cdb07021ff3b0cf0243/extension_enum.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\extension_enum.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\enum_string_mapping.inc</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\extension_enum.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\enum_string_mapping.inc</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate enum-string mapping for SPIR-V vunified1.</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate enum-string mapping for SPIR-V vunified1.</Message>
...@@ -89,13 +89,13 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -89,13 +89,13 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/extension_enum.inc;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\extension_enum.inc;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/d839d777cdb37cdb07021ff3b0cf0243/extension_enum.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\extension_enum.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\enum_string_mapping.inc</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\extension_enum.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\enum_string_mapping.inc</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\fa8e48db237811ef620e7518b63250dd\enum_string_mapping.rule"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\enum_string_mapping.rule">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
:cmEnd :cmEnd
...@@ -104,7 +104,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -104,7 +104,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/fa8e48db237811ef620e7518b63250dd/enum_string_mapping.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\extension_enum.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\enum_string_mapping.inc;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/412e367eb8014dedeaefb6a88c64e3ed/enum_string_mapping.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\extension_enum.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\enum_string_mapping.inc;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\enum_string_mapping</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\enum_string_mapping</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message>
...@@ -115,7 +115,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -115,7 +115,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/fa8e48db237811ef620e7518b63250dd/enum_string_mapping.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\extension_enum.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\enum_string_mapping.inc;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/412e367eb8014dedeaefb6a88c64e3ed/enum_string_mapping.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\extension_enum.inc;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\enum_string_mapping.inc;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\enum_string_mapping</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\enum_string_mapping</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
</CustomBuild> </CustomBuild>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\extension_enum.inc" /> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\extension_enum.inc.rule">
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\fa8e48db237811ef620e7518b63250dd\enum_string_mapping.rule"> <Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\enum_string_mapping.rule">
<Filter>CMake Rules</Filter> <Filter>CMake Rules</Filter>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
...@@ -11,7 +13,7 @@ ...@@ -11,7 +13,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="CMake Rules"> <Filter Include="CMake Rules">
<UniqueIdentifier>{5EE6D6AB-26DF-38FF-B736-7FAA511DFF82}</UniqueIdentifier> <UniqueIdentifier>{E7120DB7-422E-375E-9E9C-67A8C10F86DB}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\extinst.opencl.std.100.grammar.json" /> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\opencl.std.insts.inc.rule">
<CustomBuild Include="$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\extinst.glsl.std.450.grammar.json" /> <Filter>CMake Rules</Filter>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\fa8e48db237811ef620e7518b63250dd\extinst_tables.rule"> </CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\glsl.std.450.insts.inc.rule">
<Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\extinst_tables.rule">
<Filter>CMake Rules</Filter> <Filter>CMake Rules</Filter>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
...@@ -12,7 +16,7 @@ ...@@ -12,7 +16,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="CMake Rules"> <Filter Include="CMake Rules">
<UniqueIdentifier>{5EE6D6AB-26DF-38FF-B736-7FAA511DFF82}</UniqueIdentifier> <UniqueIdentifier>{E7120DB7-422E-375E-9E9C-67A8C10F86DB}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<PreferredToolArchitecture>x64</PreferredToolArchitecture> <PreferredToolArchitecture>x64</PreferredToolArchitecture>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{68834AD5-EAB1-379D-BD2B-1682FC06CAB6}</ProjectGuid> <ProjectGuid>{5F3076C6-2971-39DF-A3BE-A78FB0411AAE}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<Platform>x64</Platform> <Platform>x64</Platform>
...@@ -63,10 +63,9 @@ ...@@ -63,10 +63,9 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<UseFullPaths>false</UseFullPaths>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;SPIRV_WINDOWS;SPIRV_COLOR_TERMINAL;SPIRV_CHECK_CONTEXT;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;SPIRV_WINDOWS;SPIRV_COLOR_TERMINAL;SPIRV_CHECK_CONTEXT;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
...@@ -98,15 +97,13 @@ ...@@ -98,15 +97,13 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<TreatWarningAsError>true</TreatWarningAsError> <TreatWarningAsError>true</TreatWarningAsError>
<UseFullPaths>false</UseFullPaths>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;SPIRV_WINDOWS;SPIRV_COLOR_TERMINAL;SPIRV_CHECK_CONTEXT;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;SPIRV_WINDOWS;SPIRV_COLOR_TERMINAL;SPIRV_CHECK_CONTEXT;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<DebugInformationFormat> <DebugInformationFormat></DebugInformationFormat>
</DebugInformationFormat>
</ClCompile> </ClCompile>
<ResourceCompile> <ResourceCompile>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;SPIRV_WINDOWS;SPIRV_COLOR_TERMINAL;SPIRV_CHECK_CONTEXT;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;SPIRV_WINDOWS;SPIRV_COLOR_TERMINAL;SPIRV_CHECK_CONTEXT;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
...@@ -125,20 +122,16 @@ ...@@ -125,20 +122,16 @@
</Lib> </Lib>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\link\linker.cpp" /> <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\link\linker.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\SPIRV-Tools.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\SPIRV-Tools.vcxproj">
<Project>{3E7F109C-4B35-3E20-A822-17E6AD235062}</Project> <Project>{EF1AF598-E402-38F1-A74A-35F18A1EC1CC}</Project>
<Name>SPIRV-Tools</Name> <Name>SPIRV-Tools</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\opt\SPIRV-Tools-opt.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\opt\SPIRV-Tools-opt.vcxproj">
<Project>{B0B037D2-2FCD-36F3-B140-FAAEEC271424}</Project> <Project>{6ABDA7CD-3BBA-3190-AE38-B0BBE6CB9327}</Project>
<Name>SPIRV-Tools-opt</Name> <Name>SPIRV-Tools-opt</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\link\linker.cpp"> <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\link\linker.cpp">
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="Source Files"> <Filter Include="Source Files">
<UniqueIdentifier>{A1E75E1D-84CC-33C5-AED0-014DAD2C3788}</UniqueIdentifier> <UniqueIdentifier>{2F259CF2-FDFE-365E-920F-2228D7410C8D}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\aggressive_dead_code_elim_pass.cpp"> <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\opt\aggressive_dead_code_elim_pass.cpp">
...@@ -548,11 +548,11 @@ ...@@ -548,11 +548,11 @@
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="Header Files">
<UniqueIdentifier>{10CFD05B-A1B8-3F4E-B3C8-F65676382140}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files"> <Filter Include="Source Files">
<UniqueIdentifier>{A1E75E1D-84CC-33C5-AED0-014DAD2C3788}</UniqueIdentifier> <UniqueIdentifier>{2F259CF2-FDFE-365E-920F-2228D7410C8D}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{06D2D69E-DE55-30BE-A8A1-FE6C66324860}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\change_operand_reduction_opportunity.cpp"> <ClCompile Include="$(SolutionDir)third_party\SPIRV-Tools\source\reduce\change_operand_reduction_opportunity.cpp">
...@@ -92,11 +92,11 @@ ...@@ -92,11 +92,11 @@
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="Header Files">
<UniqueIdentifier>{10CFD05B-A1B8-3F4E-B3C8-F65676382140}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files"> <Filter Include="Source Files">
<UniqueIdentifier>{A1E75E1D-84CC-33C5-AED0-014DAD2C3788}</UniqueIdentifier> <UniqueIdentifier>{2F259CF2-FDFE-365E-920F-2228D7410C8D}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{06D2D69E-DE55-30BE-A8A1-FE6C66324860}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<PreferredToolArchitecture>x64</PreferredToolArchitecture> <PreferredToolArchitecture>x64</PreferredToolArchitecture>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{4E5C43E4-3AB2-33A9-ACF2-A853BE733E87}</ProjectGuid> <ProjectGuid>{033737D3-CE97-35DD-B911-848DB912467D}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<Platform>x64</Platform> <Platform>x64</Platform>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</Midl> </Midl>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\f489efd2b4222d1206a4508497d54f91\build-version.inc.rule"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\build-version.inc.rule">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Update build-version.inc in the SPIRV-Tools build directory (if necessary).</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Update build-version.inc in the SPIRV-Tools build directory (if necessary).</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
python $(SolutionDir)third_party/SPIRV-Tools/utils/update_build_version.py $(SolutionDir)third_party/SPIRV-Tools "$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/build-version.inc" python $(SolutionDir)third_party/SPIRV-Tools/utils/update_build_version.py $(SolutionDir)third_party/SPIRV-Tools "$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/build-version.inc"
...@@ -76,7 +76,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -76,7 +76,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/f489efd2b4222d1206a4508497d54f91/build-version.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\update_build_version.py;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/d839d777cdb37cdb07021ff3b0cf0243/build-version.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\update_build_version.py;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\build-version.inc</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\build-version.inc</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Update build-version.inc in the SPIRV-Tools build directory (if necessary).</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Update build-version.inc in the SPIRV-Tools build directory (if necessary).</Message>
...@@ -89,13 +89,13 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -89,13 +89,13 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/f489efd2b4222d1206a4508497d54f91/build-version.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\update_build_version.py;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/d839d777cdb37cdb07021ff3b0cf0243/build-version.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\update_build_version.py;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\build-version.inc</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\build-version.inc</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\fa8e48db237811ef620e7518b63250dd\spirv-tools-build-version.rule"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-build-version.rule">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
:cmEnd :cmEnd
...@@ -104,7 +104,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -104,7 +104,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/fa8e48db237811ef620e7518b63250dd/spirv-tools-build-version.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\build-version.inc;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/412e367eb8014dedeaefb6a88c64e3ed/spirv-tools-build-version.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\build-version.inc;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-build-version</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-build-version</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message>
...@@ -115,7 +115,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -115,7 +115,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/fa8e48db237811ef620e7518b63250dd/spirv-tools-build-version.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\build-version.inc;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/412e367eb8014dedeaefb6a88c64e3ed/spirv-tools-build-version.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\build-version.inc;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-build-version</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-build-version</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
</CustomBuild> </CustomBuild>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\f489efd2b4222d1206a4508497d54f91\build-version.inc.rule"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\build-version.inc.rule">
<Filter>CMake Rules</Filter> <Filter>CMake Rules</Filter>
</CustomBuild> </CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\fa8e48db237811ef620e7518b63250dd\spirv-tools-build-version.rule"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-build-version.rule">
<Filter>CMake Rules</Filter> <Filter>CMake Rules</Filter>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="CMake Rules"> <Filter Include="CMake Rules">
<UniqueIdentifier>{5EE6D6AB-26DF-38FF-B736-7FAA511DFF82}</UniqueIdentifier> <UniqueIdentifier>{E7120DB7-422E-375E-9E9C-67A8C10F86DB}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<PreferredToolArchitecture>x64</PreferredToolArchitecture> <PreferredToolArchitecture>x64</PreferredToolArchitecture>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{AD473E55-0E44-3036-BE39-5B3BE65B0068}</ProjectGuid> <ProjectGuid>{75B0856F-5AC7-31E6-91C6-AD88B3745281}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<Platform>x64</Platform> <Platform>x64</Platform>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</Midl> </Midl>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\f489efd2b4222d1206a4508497d54f91\debuginfo.insts.inc.rule"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\debuginfo.insts.inc.rule">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate extended instruction tables for debuginfo.</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate extended instruction tables for debuginfo.</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_grammar_tables.py --extinst-vendor-grammar=$(SolutionDir)third_party/SPIRV-Tools/source/extinst.debuginfo.grammar.json "--vendor-insts-output=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/debuginfo.insts.inc" python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_grammar_tables.py --extinst-vendor-grammar=$(SolutionDir)third_party/SPIRV-Tools/source/extinst.debuginfo.grammar.json "--vendor-insts-output=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/debuginfo.insts.inc"
...@@ -76,7 +76,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -76,7 +76,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/f489efd2b4222d1206a4508497d54f91/debuginfo.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/d839d777cdb37cdb07021ff3b0cf0243/debuginfo.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\debuginfo.insts.inc</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\debuginfo.insts.inc</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate extended instruction tables for debuginfo.</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate extended instruction tables for debuginfo.</Message>
...@@ -89,13 +89,13 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -89,13 +89,13 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/f489efd2b4222d1206a4508497d54f91/debuginfo.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/d839d777cdb37cdb07021ff3b0cf0243/debuginfo.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\debuginfo.insts.inc</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\debuginfo.insts.inc</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\fa8e48db237811ef620e7518b63250dd\spirv-tools-debuginfo.rule"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-debuginfo.rule">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
:cmEnd :cmEnd
...@@ -104,7 +104,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -104,7 +104,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/fa8e48db237811ef620e7518b63250dd/spirv-tools-debuginfo.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\debuginfo.insts.inc;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/412e367eb8014dedeaefb6a88c64e3ed/spirv-tools-debuginfo.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\debuginfo.insts.inc;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-debuginfo</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-debuginfo</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message>
...@@ -115,7 +115,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -115,7 +115,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/fa8e48db237811ef620e7518b63250dd/spirv-tools-debuginfo.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\debuginfo.insts.inc;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/412e367eb8014dedeaefb6a88c64e3ed/spirv-tools-debuginfo.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\debuginfo.insts.inc;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-debuginfo</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-debuginfo</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
</CustomBuild> </CustomBuild>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\f489efd2b4222d1206a4508497d54f91\debuginfo.insts.inc.rule"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\debuginfo.insts.inc.rule">
<Filter>CMake Rules</Filter> <Filter>CMake Rules</Filter>
</CustomBuild> </CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\fa8e48db237811ef620e7518b63250dd\spirv-tools-debuginfo.rule"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-debuginfo.rule">
<Filter>CMake Rules</Filter> <Filter>CMake Rules</Filter>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="CMake Rules"> <Filter Include="CMake Rules">
<UniqueIdentifier>{5EE6D6AB-26DF-38FF-B736-7FAA511DFF82}</UniqueIdentifier> <UniqueIdentifier>{E7120DB7-422E-375E-9E9C-67A8C10F86DB}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<PreferredToolArchitecture>x64</PreferredToolArchitecture> <PreferredToolArchitecture>x64</PreferredToolArchitecture>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{20EF1EEA-F06C-3ED1-8FB0-35CC22FFC310}</ProjectGuid> <ProjectGuid>{15CEFCBE-B270-3849-9E1F-A5A35F5374C3}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<Platform>x64</Platform> <Platform>x64</Platform>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</Midl> </Midl>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)third_party\SPIRV-Tools\utils\generate_language_headers.py"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\DebugInfo.h.rule">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate language specific header for DebugInfo.</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate language specific header for DebugInfo.</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_language_headers.py --extinst-name=DebugInfo --extinst-grammar=$(SolutionDir)third_party/SPIRV-Tools/source/extinst.debuginfo.grammar.json "--extinst-output-base=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/DebugInfo" python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_language_headers.py --extinst-name=DebugInfo --extinst-grammar=$(SolutionDir)third_party/SPIRV-Tools/source/extinst.debuginfo.grammar.json "--extinst-output-base=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/DebugInfo"
...@@ -76,7 +76,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -76,7 +76,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)third_party/SPIRV-Tools/utils/generate_language_headers.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_language_headers.py;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/d839d777cdb37cdb07021ff3b0cf0243/DebugInfo.h.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_language_headers.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\DebugInfo.h</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\DebugInfo.h</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate language specific header for DebugInfo.</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate language specific header for DebugInfo.</Message>
...@@ -89,13 +89,13 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -89,13 +89,13 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)third_party/SPIRV-Tools/utils/generate_language_headers.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_language_headers.py;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/d839d777cdb37cdb07021ff3b0cf0243/DebugInfo.h.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_language_headers.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\DebugInfo.h</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\DebugInfo.h</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\fa8e48db237811ef620e7518b63250dd\spirv-tools-header-DebugInfo.rule"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-header-DebugInfo.rule">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
:cmEnd :cmEnd
...@@ -104,7 +104,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -104,7 +104,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/fa8e48db237811ef620e7518b63250dd/spirv-tools-header-DebugInfo.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\DebugInfo.h;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/412e367eb8014dedeaefb6a88c64e3ed/spirv-tools-header-DebugInfo.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\DebugInfo.h;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-header-DebugInfo</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-header-DebugInfo</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message>
...@@ -115,7 +115,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -115,7 +115,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/fa8e48db237811ef620e7518b63250dd/spirv-tools-header-DebugInfo.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\DebugInfo.h;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/412e367eb8014dedeaefb6a88c64e3ed/spirv-tools-header-DebugInfo.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\DebugInfo.h;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-header-DebugInfo</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-header-DebugInfo</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
</CustomBuild> </CustomBuild>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)third_party\SPIRV-Tools\utils\generate_language_headers.py" /> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\DebugInfo.h.rule">
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\fa8e48db237811ef620e7518b63250dd\spirv-tools-header-DebugInfo.rule"> <Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-header-DebugInfo.rule">
<Filter>CMake Rules</Filter> <Filter>CMake Rules</Filter>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
...@@ -11,7 +13,7 @@ ...@@ -11,7 +13,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="CMake Rules"> <Filter Include="CMake Rules">
<UniqueIdentifier>{5EE6D6AB-26DF-38FF-B736-7FAA511DFF82}</UniqueIdentifier> <UniqueIdentifier>{E7120DB7-422E-375E-9E9C-67A8C10F86DB}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<PreferredToolArchitecture>x64</PreferredToolArchitecture> <PreferredToolArchitecture>x64</PreferredToolArchitecture>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{02997570-CB11-3453-B25C-AE80E0ACC1C7}</ProjectGuid> <ProjectGuid>{413EAFA1-B915-3FB9-8065-261CD1875597}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<Platform>x64</Platform> <Platform>x64</Platform>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</Midl> </Midl>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-gcn-shader.grammar.json"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\spv-amd-gcn-shader.insts.inc.rule">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate extended instruction tables for spv-amd-gcn-shader.</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate extended instruction tables for spv-amd-gcn-shader.</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_grammar_tables.py --extinst-vendor-grammar=$(SolutionDir)third_party/SPIRV-Tools/source/extinst.spv-amd-gcn-shader.grammar.json "--vendor-insts-output=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spv-amd-gcn-shader.insts.inc" python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_grammar_tables.py --extinst-vendor-grammar=$(SolutionDir)third_party/SPIRV-Tools/source/extinst.spv-amd-gcn-shader.grammar.json "--vendor-insts-output=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spv-amd-gcn-shader.insts.inc"
...@@ -76,7 +76,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -76,7 +76,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)third_party/SPIRV-Tools/source/extinst.spv-amd-gcn-shader.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-gcn-shader.grammar.json;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/d839d777cdb37cdb07021ff3b0cf0243/spv-amd-gcn-shader.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-gcn-shader.grammar.json;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-gcn-shader.insts.inc</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-gcn-shader.insts.inc</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate extended instruction tables for spv-amd-gcn-shader.</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate extended instruction tables for spv-amd-gcn-shader.</Message>
...@@ -89,13 +89,13 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -89,13 +89,13 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)third_party/SPIRV-Tools/source/extinst.spv-amd-gcn-shader.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-gcn-shader.grammar.json;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/d839d777cdb37cdb07021ff3b0cf0243/spv-amd-gcn-shader.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-gcn-shader.grammar.json;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-gcn-shader.insts.inc</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-gcn-shader.insts.inc</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\fa8e48db237811ef620e7518b63250dd\spirv-tools-spv-amd-gcn-shader.rule"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-spv-amd-gcn-shader.rule">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
:cmEnd :cmEnd
...@@ -104,7 +104,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -104,7 +104,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/fa8e48db237811ef620e7518b63250dd/spirv-tools-spv-amd-gcn-shader.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-gcn-shader.insts.inc;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/412e367eb8014dedeaefb6a88c64e3ed/spirv-tools-spv-amd-gcn-shader.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-gcn-shader.insts.inc;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-gcn-shader</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-gcn-shader</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message>
...@@ -115,7 +115,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -115,7 +115,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/fa8e48db237811ef620e7518b63250dd/spirv-tools-spv-amd-gcn-shader.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-gcn-shader.insts.inc;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/412e367eb8014dedeaefb6a88c64e3ed/spirv-tools-spv-amd-gcn-shader.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-gcn-shader.insts.inc;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-gcn-shader</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-gcn-shader</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
</CustomBuild> </CustomBuild>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-gcn-shader.grammar.json" /> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\spv-amd-gcn-shader.insts.inc.rule">
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\fa8e48db237811ef620e7518b63250dd\spirv-tools-spv-amd-gcn-shader.rule"> <Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-spv-amd-gcn-shader.rule">
<Filter>CMake Rules</Filter> <Filter>CMake Rules</Filter>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
...@@ -11,7 +13,7 @@ ...@@ -11,7 +13,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="CMake Rules"> <Filter Include="CMake Rules">
<UniqueIdentifier>{5EE6D6AB-26DF-38FF-B736-7FAA511DFF82}</UniqueIdentifier> <UniqueIdentifier>{E7120DB7-422E-375E-9E9C-67A8C10F86DB}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<PreferredToolArchitecture>x64</PreferredToolArchitecture> <PreferredToolArchitecture>x64</PreferredToolArchitecture>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{37A91ACB-00EB-30D7-A48F-3CDA0348864B}</ProjectGuid> <ProjectGuid>{F353E330-643D-353C-9031-52ED11A7E914}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<Platform>x64</Platform> <Platform>x64</Platform>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</Midl> </Midl>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-ballot.grammar.json"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\spv-amd-shader-ballot.insts.inc.rule">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate extended instruction tables for spv-amd-shader-ballot.</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate extended instruction tables for spv-amd-shader-ballot.</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_grammar_tables.py --extinst-vendor-grammar=$(SolutionDir)third_party/SPIRV-Tools/source/extinst.spv-amd-shader-ballot.grammar.json "--vendor-insts-output=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spv-amd-shader-ballot.insts.inc" python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_grammar_tables.py --extinst-vendor-grammar=$(SolutionDir)third_party/SPIRV-Tools/source/extinst.spv-amd-shader-ballot.grammar.json "--vendor-insts-output=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spv-amd-shader-ballot.insts.inc"
...@@ -76,7 +76,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -76,7 +76,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)third_party/SPIRV-Tools/source/extinst.spv-amd-shader-ballot.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-ballot.grammar.json;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/d839d777cdb37cdb07021ff3b0cf0243/spv-amd-shader-ballot.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-ballot.grammar.json;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-ballot.insts.inc</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-ballot.insts.inc</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate extended instruction tables for spv-amd-shader-ballot.</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate extended instruction tables for spv-amd-shader-ballot.</Message>
...@@ -89,13 +89,13 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -89,13 +89,13 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)third_party/SPIRV-Tools/source/extinst.spv-amd-shader-ballot.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-ballot.grammar.json;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/d839d777cdb37cdb07021ff3b0cf0243/spv-amd-shader-ballot.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-ballot.grammar.json;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-ballot.insts.inc</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-ballot.insts.inc</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\fa8e48db237811ef620e7518b63250dd\spirv-tools-spv-amd-shader-ballot.rule"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-spv-amd-shader-ballot.rule">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
:cmEnd :cmEnd
...@@ -104,7 +104,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -104,7 +104,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/fa8e48db237811ef620e7518b63250dd/spirv-tools-spv-amd-shader-ballot.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-ballot.insts.inc;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/412e367eb8014dedeaefb6a88c64e3ed/spirv-tools-spv-amd-shader-ballot.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-ballot.insts.inc;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-shader-ballot</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-shader-ballot</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message>
...@@ -115,7 +115,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -115,7 +115,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/fa8e48db237811ef620e7518b63250dd/spirv-tools-spv-amd-shader-ballot.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-ballot.insts.inc;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/412e367eb8014dedeaefb6a88c64e3ed/spirv-tools-spv-amd-shader-ballot.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-ballot.insts.inc;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-shader-ballot</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-shader-ballot</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
</CustomBuild> </CustomBuild>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-ballot.grammar.json" /> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\spv-amd-shader-ballot.insts.inc.rule">
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\fa8e48db237811ef620e7518b63250dd\spirv-tools-spv-amd-shader-ballot.rule"> <Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-spv-amd-shader-ballot.rule">
<Filter>CMake Rules</Filter> <Filter>CMake Rules</Filter>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
...@@ -11,7 +13,7 @@ ...@@ -11,7 +13,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="CMake Rules"> <Filter Include="CMake Rules">
<UniqueIdentifier>{5EE6D6AB-26DF-38FF-B736-7FAA511DFF82}</UniqueIdentifier> <UniqueIdentifier>{E7120DB7-422E-375E-9E9C-67A8C10F86DB}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<PreferredToolArchitecture>x64</PreferredToolArchitecture> <PreferredToolArchitecture>x64</PreferredToolArchitecture>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{24E012D2-962F-3541-BA4E-DE9A0D7BEEC8}</ProjectGuid> <ProjectGuid>{36E309E0-4447-33C6-92DA-FFF8793CF0A6}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<Platform>x64</Platform> <Platform>x64</Platform>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</Midl> </Midl>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\spv-amd-shader-explicit-vertex-parameter.insts.inc.rule">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate extended instruction tables for spv-amd-shader-explicit-vertex-parameter.</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate extended instruction tables for spv-amd-shader-explicit-vertex-parameter.</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_grammar_tables.py --extinst-vendor-grammar=$(SolutionDir)third_party/SPIRV-Tools/source/extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json "--vendor-insts-output=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spv-amd-shader-explicit-vertex-parameter.insts.inc" python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_grammar_tables.py --extinst-vendor-grammar=$(SolutionDir)third_party/SPIRV-Tools/source/extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json "--vendor-insts-output=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spv-amd-shader-explicit-vertex-parameter.insts.inc"
...@@ -76,7 +76,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -76,7 +76,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)third_party/SPIRV-Tools/source/extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/d839d777cdb37cdb07021ff3b0cf0243/spv-amd-shader-explicit-vertex-parameter.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-explicit-vertex-parameter.insts.inc</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-explicit-vertex-parameter.insts.inc</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate extended instruction tables for spv-amd-shader-explicit-vertex-parameter.</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate extended instruction tables for spv-amd-shader-explicit-vertex-parameter.</Message>
...@@ -89,13 +89,13 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -89,13 +89,13 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)third_party/SPIRV-Tools/source/extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/d839d777cdb37cdb07021ff3b0cf0243/spv-amd-shader-explicit-vertex-parameter.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-explicit-vertex-parameter.insts.inc</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-explicit-vertex-parameter.insts.inc</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\fa8e48db237811ef620e7518b63250dd\spirv-tools-spv-amd-shader-explicit-vertex-parameter.rule"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-spv-amd-shader-explicit-vertex-parameter.rule">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
:cmEnd :cmEnd
...@@ -104,7 +104,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -104,7 +104,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/fa8e48db237811ef620e7518b63250dd/spirv-tools-spv-amd-shader-explicit-vertex-parameter.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-explicit-vertex-parameter.insts.inc;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/412e367eb8014dedeaefb6a88c64e3ed/spirv-tools-spv-amd-shader-explicit-vertex-parameter.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-explicit-vertex-parameter.insts.inc;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-shader-explicit-vertex-parameter</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-shader-explicit-vertex-parameter</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message>
...@@ -115,7 +115,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -115,7 +115,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/fa8e48db237811ef620e7518b63250dd/spirv-tools-spv-amd-shader-explicit-vertex-parameter.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-explicit-vertex-parameter.insts.inc;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/412e367eb8014dedeaefb6a88c64e3ed/spirv-tools-spv-amd-shader-explicit-vertex-parameter.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-explicit-vertex-parameter.insts.inc;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-shader-explicit-vertex-parameter</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-shader-explicit-vertex-parameter</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
</CustomBuild> </CustomBuild>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json" /> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\spv-amd-shader-explicit-vertex-parameter.insts.inc.rule">
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\fa8e48db237811ef620e7518b63250dd\spirv-tools-spv-amd-shader-explicit-vertex-parameter.rule"> <Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-spv-amd-shader-explicit-vertex-parameter.rule">
<Filter>CMake Rules</Filter> <Filter>CMake Rules</Filter>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
...@@ -11,7 +13,7 @@ ...@@ -11,7 +13,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="CMake Rules"> <Filter Include="CMake Rules">
<UniqueIdentifier>{5EE6D6AB-26DF-38FF-B736-7FAA511DFF82}</UniqueIdentifier> <UniqueIdentifier>{E7120DB7-422E-375E-9E9C-67A8C10F86DB}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<PreferredToolArchitecture>x64</PreferredToolArchitecture> <PreferredToolArchitecture>x64</PreferredToolArchitecture>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{EA53459B-6EFF-3E73-BE23-B246F51FCE30}</ProjectGuid> <ProjectGuid>{896E2DEC-7AEC-3E49-B5BC-C3A6E6E28A44}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<Platform>x64</Platform> <Platform>x64</Platform>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</Midl> </Midl>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-trinary-minmax.grammar.json"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\spv-amd-shader-trinary-minmax.insts.inc.rule">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate extended instruction tables for spv-amd-shader-trinary-minmax.</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate extended instruction tables for spv-amd-shader-trinary-minmax.</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_grammar_tables.py --extinst-vendor-grammar=$(SolutionDir)third_party/SPIRV-Tools/source/extinst.spv-amd-shader-trinary-minmax.grammar.json "--vendor-insts-output=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spv-amd-shader-trinary-minmax.insts.inc" python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_grammar_tables.py --extinst-vendor-grammar=$(SolutionDir)third_party/SPIRV-Tools/source/extinst.spv-amd-shader-trinary-minmax.grammar.json "--vendor-insts-output=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spv-amd-shader-trinary-minmax.insts.inc"
...@@ -76,7 +76,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -76,7 +76,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)third_party/SPIRV-Tools/source/extinst.spv-amd-shader-trinary-minmax.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-trinary-minmax.grammar.json;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/d839d777cdb37cdb07021ff3b0cf0243/spv-amd-shader-trinary-minmax.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-trinary-minmax.grammar.json;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-trinary-minmax.insts.inc</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-trinary-minmax.insts.inc</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate extended instruction tables for spv-amd-shader-trinary-minmax.</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate extended instruction tables for spv-amd-shader-trinary-minmax.</Message>
...@@ -89,13 +89,13 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -89,13 +89,13 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)third_party/SPIRV-Tools/source/extinst.spv-amd-shader-trinary-minmax.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-trinary-minmax.grammar.json;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/d839d777cdb37cdb07021ff3b0cf0243/spv-amd-shader-trinary-minmax.insts.inc.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_grammar_tables.py;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-trinary-minmax.grammar.json;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-trinary-minmax.insts.inc</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-trinary-minmax.insts.inc</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\fa8e48db237811ef620e7518b63250dd\spirv-tools-spv-amd-shader-trinary-minmax.rule"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-spv-amd-shader-trinary-minmax.rule">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
:cmEnd :cmEnd
...@@ -104,7 +104,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -104,7 +104,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/fa8e48db237811ef620e7518b63250dd/spirv-tools-spv-amd-shader-trinary-minmax.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-trinary-minmax.insts.inc;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/412e367eb8014dedeaefb6a88c64e3ed/spirv-tools-spv-amd-shader-trinary-minmax.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-trinary-minmax.insts.inc;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-shader-trinary-minmax</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-shader-trinary-minmax</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message>
...@@ -115,7 +115,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -115,7 +115,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/fa8e48db237811ef620e7518b63250dd/spirv-tools-spv-amd-shader-trinary-minmax.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-trinary-minmax.insts.inc;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/412e367eb8014dedeaefb6a88c64e3ed/spirv-tools-spv-amd-shader-trinary-minmax.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spv-amd-shader-trinary-minmax.insts.inc;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-shader-trinary-minmax</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-spv-amd-shader-trinary-minmax</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
</CustomBuild> </CustomBuild>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)third_party\SPIRV-Tools\source\extinst.spv-amd-shader-trinary-minmax.grammar.json" /> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\spv-amd-shader-trinary-minmax.insts.inc.rule">
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\fa8e48db237811ef620e7518b63250dd\spirv-tools-spv-amd-shader-trinary-minmax.rule"> <Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-spv-amd-shader-trinary-minmax.rule">
<Filter>CMake Rules</Filter> <Filter>CMake Rules</Filter>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
...@@ -11,7 +13,7 @@ ...@@ -11,7 +13,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="CMake Rules"> <Filter Include="CMake Rules">
<UniqueIdentifier>{5EE6D6AB-26DF-38FF-B736-7FAA511DFF82}</UniqueIdentifier> <UniqueIdentifier>{E7120DB7-422E-375E-9E9C-67A8C10F86DB}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<PreferredToolArchitecture>x64</PreferredToolArchitecture> <PreferredToolArchitecture>x64</PreferredToolArchitecture>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{23C1CFB8-D190-32DA-A4D8-22F0176468B3}</ProjectGuid> <ProjectGuid>{CE4E38AC-2FE5-356C-860E-C894AAC00DFF}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<Platform>x64</Platform> <Platform>x64</Platform>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</Midl> </Midl>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)third_party\SPIRV-Tools\utils\generate_vim_syntax.py"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\spvasm.vim.rule">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate spvasm.vim: Vim syntax file for SPIR-V assembly.</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generate spvasm.vim: Vim syntax file for SPIR-V assembly.</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_vim_syntax.py --spirv-core-grammar=$(SolutionDir)third_party/SPIRV-Headers/include/spirv/unified1/spirv.core.grammar.json --extinst-debuginfo-grammar=$(SolutionDir)third_party/SPIRV-Tools/source/extinst.debuginfo.grammar.json --extinst-glsl-grammar=$(SolutionDir)third_party/SPIRV-Headers/include/spirv/unified1/extinst.glsl.std.450.grammar.json --extinst-opencl-grammar=$(SolutionDir)third_party/SPIRV-Headers/include/spirv/unified1/extinst.opencl.std.100.grammar.json "&gt;$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spvasm.vim" python $(SolutionDir)third_party/SPIRV-Tools/utils/generate_vim_syntax.py --spirv-core-grammar=$(SolutionDir)third_party/SPIRV-Headers/include/spirv/unified1/spirv.core.grammar.json --extinst-debuginfo-grammar=$(SolutionDir)third_party/SPIRV-Tools/source/extinst.debuginfo.grammar.json --extinst-glsl-grammar=$(SolutionDir)third_party/SPIRV-Headers/include/spirv/unified1/extinst.glsl.std.450.grammar.json --extinst-opencl-grammar=$(SolutionDir)third_party/SPIRV-Headers/include/spirv/unified1/extinst.opencl.std.100.grammar.json "&gt;$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/spvasm.vim"
...@@ -76,7 +76,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -76,7 +76,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)third_party/SPIRV-Tools/utils/generate_vim_syntax.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\extinst.glsl.std.450.grammar.json;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\extinst.opencl.std.100.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_vim_syntax.py;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/d839d777cdb37cdb07021ff3b0cf0243/spvasm.vim.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_vim_syntax.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\extinst.glsl.std.450.grammar.json;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\extinst.opencl.std.100.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spvasm.vim</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spvasm.vim</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate spvasm.vim: Vim syntax file for SPIR-V assembly.</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generate spvasm.vim: Vim syntax file for SPIR-V assembly.</Message>
...@@ -89,13 +89,13 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -89,13 +89,13 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)third_party/SPIRV-Tools/utils/generate_vim_syntax.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\extinst.glsl.std.450.grammar.json;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\extinst.opencl.std.100.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_vim_syntax.py;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/d839d777cdb37cdb07021ff3b0cf0243/spvasm.vim.rule;$(SolutionDir)third_party\SPIRV-Tools\utils\generate_vim_syntax.py;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\spirv.core.grammar.json;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\extinst.glsl.std.450.grammar.json;$(SolutionDir)third_party\SPIRV-Headers\include\spirv\unified1\extinst.opencl.std.100.grammar.json;$(SolutionDir)third_party\SPIRV-Tools\source\extinst.debuginfo.grammar.json;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spvasm.vim</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spvasm.vim</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\fa8e48db237811ef620e7518b63250dd\spirv-tools-vimsyntax.rule"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-vimsyntax.rule">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
:cmEnd :cmEnd
...@@ -104,7 +104,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -104,7 +104,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/fa8e48db237811ef620e7518b63250dd/spirv-tools-vimsyntax.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spvasm.vim;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/412e367eb8014dedeaefb6a88c64e3ed/spirv-tools-vimsyntax.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spvasm.vim;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-vimsyntax</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-vimsyntax</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message>
...@@ -115,7 +115,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -115,7 +115,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/fa8e48db237811ef620e7518b63250dd/spirv-tools-vimsyntax.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spvasm.vim;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/412e367eb8014dedeaefb6a88c64e3ed/spirv-tools-vimsyntax.rule;$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\spvasm.vim;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-vimsyntax</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\CMakeFiles\spirv-tools-vimsyntax</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
</CustomBuild> </CustomBuild>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)third_party\SPIRV-Tools\utils\generate_vim_syntax.py" /> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\d839d777cdb37cdb07021ff3b0cf0243\spvasm.vim.rule">
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\fa8e48db237811ef620e7518b63250dd\spirv-tools-vimsyntax.rule"> <Filter>CMake Rules</Filter>
</CustomBuild>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\412e367eb8014dedeaefb6a88c64e3ed\spirv-tools-vimsyntax.rule">
<Filter>CMake Rules</Filter> <Filter>CMake Rules</Filter>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
...@@ -11,7 +13,7 @@ ...@@ -11,7 +13,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="CMake Rules"> <Filter Include="CMake Rules">
<UniqueIdentifier>{5EE6D6AB-26DF-38FF-B736-7FAA511DFF82}</UniqueIdentifier> <UniqueIdentifier>{E7120DB7-422E-375E-9E9C-67A8C10F86DB}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<PreferredToolArchitecture>x64</PreferredToolArchitecture> <PreferredToolArchitecture>x64</PreferredToolArchitecture>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{4A218750-64B6-317F-BB39-6343D956CDFE}</ProjectGuid> <ProjectGuid>{EC5297D9-ED1C-3BE6-BF71-3D76CD9B2AA7}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<Platform>x64</Platform> <Platform>x64</Platform>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</Midl> </Midl>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\cf22396583c2517c8bbedf6430f06fd5\spirv-tools-pkg-config.rule"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\27d298d334ba2598781edad1159af4a3\spirv-tools-pkg-config.rule">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
"cmake" -DCHANGES_FILE=$(SolutionDir)third_party/SPIRV-Tools/CHANGES -DTEMPLATE_FILE=$(SolutionDir)third_party/SPIRV-Tools/cmake/SPIRV-Tools.pc.in "-DOUT_FILE=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/SPIRV-Tools.pc" "-DCMAKE_INSTALL_PREFIX=C:/Program Files/SwiftShader" -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_INCLUDEDIR=include "-DSPIRV_LIBRARIES=-lSPIRV-Tools -lSPIRV-Tools-link -lSPIRV-Tools-opt" -P $(SolutionDir)third_party/SPIRV-Tools/cmake/write_pkg_config.cmake "cmake" -DCHANGES_FILE=$(SolutionDir)third_party/SPIRV-Tools/CHANGES -DTEMPLATE_FILE=$(SolutionDir)third_party/SPIRV-Tools/cmake/SPIRV-Tools.pc.in "-DOUT_FILE=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/SPIRV-Tools.pc" "-DCMAKE_INSTALL_PREFIX=C:/Program Files/SwiftShader" -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_INCLUDEDIR=include "-DSPIRV_LIBRARIES=-lSPIRV-Tools -lSPIRV-Tools-link -lSPIRV-Tools-opt" -P $(SolutionDir)third_party/SPIRV-Tools/cmake/write_pkg_config.cmake
...@@ -76,7 +76,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -76,7 +76,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/cf22396583c2517c8bbedf6430f06fd5/spirv-tools-pkg-config.rule;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;$(SolutionDir)third_party\SPIRV-Tools\cmake\SPIRV-Tools.pc.in;$(SolutionDir)third_party\SPIRV-Tools\cmake\write_pkg_config.cmake;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/27d298d334ba2598781edad1159af4a3/spirv-tools-pkg-config.rule;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;$(SolutionDir)third_party\SPIRV-Tools\cmake\SPIRV-Tools.pc.in;$(SolutionDir)third_party\SPIRV-Tools\cmake\write_pkg_config.cmake;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\CMakeFiles\spirv-tools-pkg-config</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\CMakeFiles\spirv-tools-pkg-config</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message>
...@@ -89,7 +89,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -89,7 +89,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/cf22396583c2517c8bbedf6430f06fd5/spirv-tools-pkg-config.rule;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;$(SolutionDir)third_party\SPIRV-Tools\cmake\SPIRV-Tools.pc.in;$(SolutionDir)third_party\SPIRV-Tools\cmake\write_pkg_config.cmake;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/27d298d334ba2598781edad1159af4a3/spirv-tools-pkg-config.rule;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;$(SolutionDir)third_party\SPIRV-Tools\cmake\SPIRV-Tools.pc.in;$(SolutionDir)third_party\SPIRV-Tools\cmake\write_pkg_config.cmake;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\CMakeFiles\spirv-tools-pkg-config</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\CMakeFiles\spirv-tools-pkg-config</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
</CustomBuild> </CustomBuild>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\cf22396583c2517c8bbedf6430f06fd5\spirv-tools-pkg-config.rule"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\27d298d334ba2598781edad1159af4a3\spirv-tools-pkg-config.rule">
<Filter>CMake Rules</Filter> <Filter>CMake Rules</Filter>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="CMake Rules"> <Filter Include="CMake Rules">
<UniqueIdentifier>{5EE6D6AB-26DF-38FF-B736-7FAA511DFF82}</UniqueIdentifier> <UniqueIdentifier>{E7120DB7-422E-375E-9E9C-67A8C10F86DB}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<PreferredToolArchitecture>x64</PreferredToolArchitecture> <PreferredToolArchitecture>x64</PreferredToolArchitecture>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{DC3E944C-5424-3F8B-B027-42D2C8D00D87}</ProjectGuid> <ProjectGuid>{0FA45296-9836-3DE4-BEA5-F2029797A16F}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<Platform>x64</Platform> <Platform>x64</Platform>
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
</Midl> </Midl>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\cf22396583c2517c8bbedf6430f06fd5\spirv-tools-shared-pkg-config.rule"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\27d298d334ba2598781edad1159af4a3\spirv-tools-shared-pkg-config.rule">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">setlocal
"cmake" -DCHANGES_FILE=$(SolutionDir)third_party/SPIRV-Tools/CHANGES -DTEMPLATE_FILE=$(SolutionDir)third_party/SPIRV-Tools/cmake/SPIRV-Tools-shared.pc.in "-DOUT_FILE=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/SPIRV-Tools-shared.pc" "-DCMAKE_INSTALL_PREFIX=C:/Program Files/SwiftShader" -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_INCLUDEDIR=include -DSPIRV_SHARED_LIBRARIES=-lSPIRV-Tools-shared -P $(SolutionDir)third_party/SPIRV-Tools/cmake/write_pkg_config.cmake "cmake" -DCHANGES_FILE=$(SolutionDir)third_party/SPIRV-Tools/CHANGES -DTEMPLATE_FILE=$(SolutionDir)third_party/SPIRV-Tools/cmake/SPIRV-Tools-shared.pc.in "-DOUT_FILE=$(SolutionDir)build/Visual Studio 15 2017 Win64/third_party/SPIRV-Tools/SPIRV-Tools-shared.pc" "-DCMAKE_INSTALL_PREFIX=C:/Program Files/SwiftShader" -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_INCLUDEDIR=include -DSPIRV_SHARED_LIBRARIES=-lSPIRV-Tools-shared -P $(SolutionDir)third_party/SPIRV-Tools/cmake/write_pkg_config.cmake
...@@ -76,7 +76,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -76,7 +76,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/cf22396583c2517c8bbedf6430f06fd5/spirv-tools-shared-pkg-config.rule;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;$(SolutionDir)third_party\SPIRV-Tools\cmake\SPIRV-Tools-shared.pc.in;$(SolutionDir)third_party\SPIRV-Tools\cmake\write_pkg_config.cmake;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/27d298d334ba2598781edad1159af4a3/spirv-tools-shared-pkg-config.rule;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;$(SolutionDir)third_party\SPIRV-Tools\cmake\SPIRV-Tools-shared.pc.in;$(SolutionDir)third_party\SPIRV-Tools\cmake\write_pkg_config.cmake;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\CMakeFiles\spirv-tools-shared-pkg-config</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\CMakeFiles\spirv-tools-shared-pkg-config</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkObjects>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></Message>
...@@ -89,7 +89,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone ...@@ -89,7 +89,7 @@ endlocal &amp; call :cmErrorLevel %errorlevel% &amp; goto :cmDone
exit /b %1 exit /b %1
:cmDone :cmDone
if %errorlevel% neq 0 goto :VCEnd</Command> if %errorlevel% neq 0 goto :VCEnd</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/cf22396583c2517c8bbedf6430f06fd5/spirv-tools-shared-pkg-config.rule;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;$(SolutionDir)third_party\SPIRV-Tools\cmake\SPIRV-Tools-shared.pc.in;$(SolutionDir)third_party\SPIRV-Tools\cmake\write_pkg_config.cmake;%(AdditionalInputs)</AdditionalInputs> <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build/Visual Studio 15 2017 Win64/CMakeFiles/27d298d334ba2598781edad1159af4a3/spirv-tools-shared-pkg-config.rule;$(SolutionDir)third_party\SPIRV-Tools\CHANGES;$(SolutionDir)third_party\SPIRV-Tools\cmake\SPIRV-Tools-shared.pc.in;$(SolutionDir)third_party\SPIRV-Tools\cmake\write_pkg_config.cmake;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\CMakeFiles\spirv-tools-shared-pkg-config</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\CMakeFiles\spirv-tools-shared-pkg-config</Outputs>
<LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects> <LinkObjects Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkObjects>
</CustomBuild> </CustomBuild>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\cf22396583c2517c8bbedf6430f06fd5\spirv-tools-shared-pkg-config.rule"> <CustomBuild Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\CMakeFiles\27d298d334ba2598781edad1159af4a3\spirv-tools-shared-pkg-config.rule">
<Filter>CMake Rules</Filter> <Filter>CMake Rules</Filter>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="CMake Rules"> <Filter Include="CMake Rules">
<UniqueIdentifier>{5EE6D6AB-26DF-38FF-B736-7FAA511DFF82}</UniqueIdentifier> <UniqueIdentifier>{E7120DB7-422E-375E-9E9C-67A8C10F86DB}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<PreferredToolArchitecture>x64</PreferredToolArchitecture> <PreferredToolArchitecture>x64</PreferredToolArchitecture>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{38D16894-006A-34D5-886C-E4C89169E935}</ProjectGuid> <ProjectGuid>{4BDD6A5B-67E0-33DF-950C-4AD0ABB1D729}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<Platform>x64</Platform> <Platform>x64</Platform>
...@@ -66,9 +66,8 @@ ...@@ -66,9 +66,8 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<UseFullPaths>false</UseFullPaths>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>WIN32;_WINDOWS;STANDALONE;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_WINDOWS;STANDALONE;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR="Debug";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
...@@ -109,14 +108,12 @@ ...@@ -109,14 +108,12 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation> <MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo> <RuntimeTypeInfo>true</RuntimeTypeInfo>
<UseFullPaths>false</UseFullPaths>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;STANDALONE;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;STANDALONE;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR="Release";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName> <ObjectFileName>$(IntDir)</ObjectFileName>
<DebugInformationFormat> <DebugInformationFormat></DebugInformationFormat>
</DebugInformationFormat>
</ClCompile> </ClCompile>
<ResourceCompile> <ResourceCompile>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;STANDALONE;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;STANDALONE;_CRT_SECURE_NO_WARNINGS;_SBCS;WINVER=0x501;NOMINMAX;STRICT;REACTOR_LLVM_VERSION=7;CMAKE_INTDIR=\"Release\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
...@@ -145,46 +142,34 @@ ...@@ -145,46 +142,34 @@
</ProjectReference> </ProjectReference>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)tests\GLESUnitTests\main.cpp" /> <ClCompile Include="$(SolutionDir)tests\GLESUnitTests\main.cpp" />
<ClCompile Include="$(SolutionDir)tests\GLESUnitTests\unittests.cpp" /> <ClCompile Include="$(SolutionDir)tests\GLESUnitTests\unittests.cpp" />
<ClCompile Include="$(SolutionDir)third_party\googletest\googletest\src\gtest-all.cc" /> <ClCompile Include="$(SolutionDir)third_party\googletest\googletest\src\gtest-all.cc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\GLCompiler.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\GLCompiler.vcxproj">
<Project>{047A7872-884C-3C12-80D7-FCFF050028EB}</Project> <Project>{74318028-369F-3EA0-8A99-A341020416D6}</Project>
<Name>GLCompiler</Name> <Name>GLCompiler</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\ReactorLLVM.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\ReactorLLVM.vcxproj">
<Project>{5ECCA9F3-BDF7-3269-9AE0-1EE596E7751A}</Project> <Project>{3E565C6C-4B64-3128-A009-4A91C77E00E5}</Project>
<Name>ReactorLLVM</Name> <Name>ReactorLLVM</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\SwiftShader.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\SwiftShader.vcxproj">
<Project>{E0557C2F-3FD0-3856-8D9A-B7B2E2756E9B}</Project> <Project>{996E1D94-926B-3585-9466-CDB769D7188C}</Project>
<Name>SwiftShader</Name> <Name>SwiftShader</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\libEGL.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\libEGL.vcxproj">
<Project>{2E445C8F-6ADD-392A-89F9-6ED9DD702A33}</Project> <Project>{B49D30BB-AC67-3799-8A4E-B5F883BB229B}</Project>
<Name>libEGL</Name> <Name>libEGL</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\libGLESv2.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\libGLESv2.vcxproj">
<Project>{E830C9A7-C84E-3582-8CF8-260995751A36}</Project> <Project>{E22D780F-96F6-3714-B708-4875F7F8F6FF}</Project>
<Name>libGLESv2</Name> <Name>libGLESv2</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
<ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\llvm.vcxproj"> <ProjectReference Include="$(SolutionDir)build\Visual Studio 15 2017 Win64\llvm.vcxproj">
<Project>{B44D8E62-2817-31C5-B7BB-FCF653D5AF44}</Project> <Project>{9B24984C-F78C-3EF7-907B-2B0D2CDB5695}</Project>
<Name>llvm</Name> <Name>llvm</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="$(SolutionDir)tests\GLESUnitTests\main.cpp"> <ClCompile Include="$(SolutionDir)tests\GLESUnitTests\main.cpp">
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Filter Include="Source Files"> <Filter Include="Source Files">
<UniqueIdentifier>{A1E75E1D-84CC-33C5-AED0-014DAD2C3788}</UniqueIdentifier> <UniqueIdentifier>{2F259CF2-FDFE-365E-920F-2228D7410C8D}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
...@@ -48,4 +48,6 @@ find . -type f \( -name \*.vcxproj -o -name \*.vcxproj.filters -o -name \*.sln \ ...@@ -48,4 +48,6 @@ find . -type f \( -name \*.vcxproj -o -name \*.vcxproj.filters -o -name \*.sln \
-execdir sed --in-place --binary --expression="s?$CD?\$(SolutionDir)?g" {} \ -execdir sed --in-place --binary --expression="s?$CD?\$(SolutionDir)?g" {} \
--expression="s?$CD2?\$(SolutionDir)?g" {} \ --expression="s?$CD2?\$(SolutionDir)?g" {} \
--expression="s?$PYTHON?python?g" {} \ --expression="s?$PYTHON?python?g" {} \
--expression="s?$CMAKE?cmake?g" {} \; --expression="s?$CMAKE?cmake?g" {} \
\ No newline at end of file --expression="s?MultiThreadedDebugDLL?MultiThreadedDebug?g" {} \
--expression="s?MultiThreadedDLL?MultiThreaded?g" {} \;
\ No newline at end of file
...@@ -12,10 +12,11 @@ ...@@ -12,10 +12,11 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#include <Pipeline/SpirvShader.hpp>
#include <spirv-tools/optimizer.hpp>
#include "VkPipeline.hpp" #include "VkPipeline.hpp"
#include "VkShaderModule.hpp" #include "VkShaderModule.hpp"
#include "Pipeline/SpirvShader.hpp"
#include "spirv-tools/optimizer.hpp"
namespace namespace
{ {
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)third_party\SPIRV-Headers\include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)third_party\SPIRV-Headers\include;$(SolutionDir)third_party\SPIRV-Tools\include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
...@@ -82,7 +82,7 @@ copy "$(OutDir)vk_swiftshader.dll" "$(SolutionDir)out\$(Configuration)_$(Platfor ...@@ -82,7 +82,7 @@ copy "$(OutDir)vk_swiftshader.dll" "$(SolutionDir)out\$(Configuration)_$(Platfor
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)third_party\SPIRV-Headers\include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)third_party\SPIRV-Headers\include;$(SolutionDir)third_party\SPIRV-Tools\include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;DEBUGGER_WAIT_DIALOG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;DEBUGGER_WAIT_DIALOG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>
...@@ -314,6 +314,12 @@ copy "$(OutDir)vk_swiftshader.dll" "$(SolutionDir)out\$(Configuration)_$(Platfor ...@@ -314,6 +314,12 @@ copy "$(OutDir)vk_swiftshader.dll" "$(SolutionDir)out\$(Configuration)_$(Platfor
<ResourceCompile Include="Vulkan.rc" /> <ResourceCompile Include="Vulkan.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\opt\SPIRV-Tools-opt.vcxproj">
<Project>{ce414127-5528-30f5-9f5f-5af9d2b8c04c}</Project>
</ProjectReference>
<ProjectReference Include="..\..\build\Visual Studio 15 2017 Win64\third_party\SPIRV-Tools\source\SPIRV-Tools.vcxproj">
<Project>{83d86993-70d0-336a-84f1-8b952b8079dd}</Project>
</ProjectReference>
<ProjectReference Include="..\Reactor\Reactor.vcxproj"> <ProjectReference Include="..\Reactor\Reactor.vcxproj">
<Project>{28fd076d-10b5-4bd8-a4cf-f44c7002a803}</Project> <Project>{28fd076d-10b5-4bd8-a4cf-f44c7002a803}</Project>
</ProjectReference> </ProjectReference>
......
...@@ -99,9 +99,6 @@ ...@@ -99,9 +99,6 @@
<ClCompile Include="..\Device\Blitter.cpp"> <ClCompile Include="..\Device\Blitter.cpp">
<Filter>Source Files\Device</Filter> <Filter>Source Files\Device</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\Pipeline\VertexShader.cpp">
<Filter>Source Files\Pipeline</Filter>
</ClCompile>
<ClCompile Include="..\Pipeline\VertexRoutine.cpp"> <ClCompile Include="..\Pipeline\VertexRoutine.cpp">
<Filter>Source Files\Pipeline</Filter> <Filter>Source Files\Pipeline</Filter>
</ClCompile> </ClCompile>
...@@ -111,18 +108,12 @@ ...@@ -111,18 +108,12 @@
<ClCompile Include="..\Pipeline\ShaderCore.cpp"> <ClCompile Include="..\Pipeline\ShaderCore.cpp">
<Filter>Source Files\Pipeline</Filter> <Filter>Source Files\Pipeline</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\Pipeline\Shader.cpp">
<Filter>Source Files\Pipeline</Filter>
</ClCompile>
<ClCompile Include="..\Pipeline\SetupRoutine.cpp"> <ClCompile Include="..\Pipeline\SetupRoutine.cpp">
<Filter>Source Files\Pipeline</Filter> <Filter>Source Files\Pipeline</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\Pipeline\SamplerCore.cpp"> <ClCompile Include="..\Pipeline\SamplerCore.cpp">
<Filter>Source Files\Pipeline</Filter> <Filter>Source Files\Pipeline</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\Pipeline\PixelShader.cpp">
<Filter>Source Files\Pipeline</Filter>
</ClCompile>
<ClCompile Include="..\Pipeline\PixelRoutine.cpp"> <ClCompile Include="..\Pipeline\PixelRoutine.cpp">
<Filter>Source Files\Pipeline</Filter> <Filter>Source Files\Pipeline</Filter>
</ClCompile> </ClCompile>
...@@ -461,9 +452,6 @@ ...@@ -461,9 +452,6 @@
<ClInclude Include="..\WSI\libX11.hpp"> <ClInclude Include="..\WSI\libX11.hpp">
<Filter>Header Files\WSI</Filter> <Filter>Header Files\WSI</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\Pipeline\VertexShader.hpp">
<Filter>Header Files\Pipeline</Filter>
</ClInclude>
<ClInclude Include="..\Pipeline\VertexRoutine.hpp"> <ClInclude Include="..\Pipeline\VertexRoutine.hpp">
<Filter>Header Files\Pipeline</Filter> <Filter>Header Files\Pipeline</Filter>
</ClInclude> </ClInclude>
...@@ -476,18 +464,12 @@ ...@@ -476,18 +464,12 @@
<ClInclude Include="..\Pipeline\ShaderCore.hpp"> <ClInclude Include="..\Pipeline\ShaderCore.hpp">
<Filter>Header Files\Pipeline</Filter> <Filter>Header Files\Pipeline</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\Pipeline\Shader.hpp">
<Filter>Header Files\Pipeline</Filter>
</ClInclude>
<ClInclude Include="..\Pipeline\SetupRoutine.hpp"> <ClInclude Include="..\Pipeline\SetupRoutine.hpp">
<Filter>Header Files\Pipeline</Filter> <Filter>Header Files\Pipeline</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\Pipeline\SamplerCore.hpp"> <ClInclude Include="..\Pipeline\SamplerCore.hpp">
<Filter>Header Files\Pipeline</Filter> <Filter>Header Files\Pipeline</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\Pipeline\PixelShader.hpp">
<Filter>Header Files\Pipeline</Filter>
</ClInclude>
<ClInclude Include="..\Pipeline\PixelRoutine.hpp"> <ClInclude Include="..\Pipeline\PixelRoutine.hpp">
<Filter>Header Files\Pipeline</Filter> <Filter>Header Files\Pipeline</Filter>
</ClInclude> </ClInclude>
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>GL_GLEXT_PROTOTYPES;STANDALONE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>GL_GLEXT_PROTOTYPES;STANDALONE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(SolutionDir)include\;$(SolutionDir)third_party\googletest\googletest\include\;$(SolutionDir)third_party\googletest\googletest\;$(SolutionDir)third_party\googletest\googlemock\include\;SubmoduleCheck;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir)include\;$(SolutionDir)third_party\SPIRV-Tools\include;$(SolutionDir)third_party\googletest\googletest\include\;$(SolutionDir)third_party\googletest\googletest\;$(SolutionDir)third_party\googletest\googlemock\include\;SubmoduleCheck;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles> <ForcedIncludeFiles>
</ForcedIncludeFiles> </ForcedIncludeFiles>
<TreatSpecificWarningsAsErrors>4018;5038;4838</TreatSpecificWarningsAsErrors> <TreatSpecificWarningsAsErrors>4018;5038;4838</TreatSpecificWarningsAsErrors>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>GL_GLEXT_PROTOTYPES;STANDALONE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>GL_GLEXT_PROTOTYPES;STANDALONE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(SolutionDir)include\;$(SolutionDir)third_party\googletest\googletest\include\;$(SolutionDir)third_party\googletest\googletest\;$(SolutionDir)third_party\googletest\googlemock\include\;SubmoduleCheck;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(SolutionDir)include\;$(SolutionDir)third_party\SPIRV-Tools\include;$(SolutionDir)third_party\googletest\googletest\include\;$(SolutionDir)third_party\googletest\googletest\;$(SolutionDir)third_party\googletest\googlemock\include\;SubmoduleCheck;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles> <ForcedIncludeFiles>
</ForcedIncludeFiles> </ForcedIncludeFiles>
<TreatSpecificWarningsAsErrors>4018;5038;4838</TreatSpecificWarningsAsErrors> <TreatSpecificWarningsAsErrors>4018;5038;4838</TreatSpecificWarningsAsErrors>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment