diff options
| author | Pär Björklund <per@ohmy.nu> | 2016-08-06 18:17:14 +0200 |
|---|---|---|
| committer | Christian Fetzer <fetzer.ch@gmail.com> | 2016-08-09 18:16:25 +0200 |
| commit | 72bb2e3ce7dacb72f2548b2d0b70efc0f03d2b6c (patch) | |
| tree | ad749825bfc1f821677f6464933ad4ce465e1477 /lib | |
| parent | df8e7a127efc910f72f1951499ab5baec6ba982c (diff) | |
Update to latest effects11, august 2 2016 release
Diffstat (limited to 'lib')
28 files changed, 1842 insertions, 101 deletions
diff --git a/lib/win32/Effects11/.gitignore b/lib/win32/Effects11/.gitignore new file mode 100644 index 0000000000..4888f95987 --- /dev/null +++ b/lib/win32/Effects11/.gitignore @@ -0,0 +1,21 @@ +*.psess +*.vsp +*.log +*.err +*.wrn +*.suo +*.sdf +*.user +*.i +*.vspscc +*.opensdf +*.opendb +*.ipch +*.cache +*.tlog +*.lastbuildstate +*.ilk +*.VC.db +/ipch +Bin +/wiki
\ No newline at end of file diff --git a/lib/win32/Effects11/Effect.h b/lib/win32/Effects11/Effect.h index 86162732a7..3bd16fb6b2 100644 --- a/lib/win32/Effects11/Effect.h +++ b/lib/win32/Effects11/Effect.h @@ -732,7 +732,7 @@ struct SAnonymousShader : public TUncastableVariable<ID3DX11EffectShaderVariable { SShaderBlock *pShaderBlock; - SAnonymousShader(_In_ SShaderBlock *pBlock = nullptr); + SAnonymousShader(_In_opt_ SShaderBlock *pBlock = nullptr); // ID3DX11EffectShaderVariable interface STDMETHOD_(bool, IsValid)() override; diff --git a/lib/win32/Effects11/EffectAPI.cpp b/lib/win32/Effects11/EffectAPI.cpp index 69e1671b22..fd4065cca8 100644 --- a/lib/win32/Effects11/EffectAPI.cpp +++ b/lib/win32/Effects11/EffectAPI.cpp @@ -156,7 +156,7 @@ HRESULT WINAPI D3DX11CreateEffectFromFile( LPCWSTR pFileName, UINT FXFlags, ID3D int result = WideCharToMultiByte( CP_ACP, WC_NO_BEST_FIT_CHARS, pFileName, -1, strFileA, MAX_PATH, nullptr, FALSE ); if ( !result ) { - DPF(0, "Failed to load effect file due to WC to MB conversion failure: %S", pFileName); + DPF(0, "Failed to load effect file due to WC to MB conversion failure: %ls", pFileName); hr = E_FAIL; goto lExit; } @@ -245,7 +245,7 @@ HRESULT D3DX11CompileEffectFromFile( LPCWSTR pFileName, HRESULT hr = D3DCompileFromFile( pFileName, pDefines, pInclude, "", "fx_5_0", HLSLFlags, FXFlags, &blob, ppErrors ); if ( FAILED(hr) ) { - DPF(0, "D3DCompileFromFile of fx_5_0 profile failed %08X: %S", hr, pFileName ); + DPF(0, "D3DCompileFromFile of fx_5_0 profile failed %08X: %ls", hr, pFileName ); return hr; } @@ -256,7 +256,7 @@ HRESULT D3DX11CompileEffectFromFile( LPCWSTR pFileName, HRESULT hr = LoadBinaryFromFile( pFileName, fileData, size ); if ( FAILED(hr) ) { - DPF(0, "Failed to load effect file %08X: %S", hr, pFileName); + DPF(0, "Failed to load effect file %08X: %ls", hr, pFileName); return hr; } @@ -265,7 +265,7 @@ HRESULT D3DX11CompileEffectFromFile( LPCWSTR pFileName, int result = WideCharToMultiByte( CP_ACP, WC_NO_BEST_FIT_CHARS, pFileName, -1, strFileA, MAX_PATH, nullptr, FALSE ); if ( !result ) { - DPF(0, "Failed to load effect file due to WC to MB conversion failure: %S", pFileName); + DPF(0, "Failed to load effect file due to WC to MB conversion failure: %ls", pFileName); return E_FAIL; } @@ -308,7 +308,7 @@ HRESULT D3DX11CompileEffectFromFile( LPCWSTR pFileName, int result = WideCharToMultiByte( CP_ACP, WC_NO_BEST_FIT_CHARS, pFileName, -1, strFileA, MAX_PATH, nullptr, FALSE ); if ( !result ) { - DPF(0, "Failed to load effect file due to WC to MB conversion failure: %S", pFileName); + DPF(0, "Failed to load effect file due to WC to MB conversion failure: %ls", pFileName); hr = E_FAIL; goto lExit; } diff --git a/lib/win32/Effects11/EffectNonRuntime.cpp b/lib/win32/Effects11/EffectNonRuntime.cpp index 3161dfa892..75114121ce 100644 --- a/lib/win32/Effects11/EffectNonRuntime.cpp +++ b/lib/win32/Effects11/EffectNonRuntime.cpp @@ -1025,11 +1025,14 @@ void CEffect::AddRefAllForCloning( _In_ CEffect* pEffectSource ) } // There's no need to AddRef CBs, since they are recreated - assert(nullptr == m_pCBs || pEffectSource->m_Heap.IsInHeap(m_pCBs)); - for ( size_t i = 0; i < m_CBCount; ++ i) + if (m_pCBs) { - SAFE_ADDREF(m_pCBs[i].TBuffer.pShaderResource); - SAFE_ADDREF(m_pCBs[i].pD3DObject); + assert(pEffectSource->m_Heap.IsInHeap(m_pCBs)); + for (size_t i = 0; i < m_CBCount; ++i) + { + SAFE_ADDREF(m_pCBs[i].TBuffer.pShaderResource); + SAFE_ADDREF(m_pCBs[i].pD3DObject); + } } assert(nullptr == m_pShaderBlocks || pEffectSource->m_Heap.IsInHeap(m_pShaderBlocks)); diff --git a/lib/win32/Effects11/EffectReflection.cpp b/lib/win32/Effects11/EffectReflection.cpp index a7212f0c9f..4ed057b98b 100644 --- a/lib/win32/Effects11/EffectReflection.cpp +++ b/lib/win32/Effects11/EffectReflection.cpp @@ -601,7 +601,7 @@ lExit: // ID3DX11EffectShaderVariable (SAnonymousShader implementation) //////////////////////////////////////////////////////////////////////////////// -SAnonymousShader::SAnonymousShader(_In_ SShaderBlock *pBlock) : pShaderBlock(pBlock) +SAnonymousShader::SAnonymousShader(_In_opt_ SShaderBlock *pBlock) : pShaderBlock(pBlock) { } diff --git a/lib/win32/Effects11/EffectVariable.inl b/lib/win32/Effects11/EffectVariable.inl index ac65599a09..fdafb2abea 100644 --- a/lib/win32/Effects11/EffectVariable.inl +++ b/lib/win32/Effects11/EffectVariable.inl @@ -2533,7 +2533,8 @@ HRESULT TVector4Variable<IBaseInterface>::SetFloatVectorArray(const float *pData DirtyVariable(); // ensure we don't write over the padding at the end of the vector array - memcpy(Data.pVector + Offset, pData, std::min<size_t>((Offset + Count) * sizeof(CEffectVector4), pType->TotalSize)); + memcpy(Data.pVector + Offset, pData, + std::min<size_t>(Count * sizeof(CEffectVector4), pType->TotalSize - (Offset * sizeof(CEffectVector4)))); lExit: return hr; @@ -2556,7 +2557,8 @@ HRESULT TVector4Variable<IBaseInterface>::GetFloatVectorArray(float *pData, uint #endif // ensure we don't read past the end of the vector array - memcpy(pData, Data.pVector + Offset, std::min<size_t>((Offset + Count) * sizeof(CEffectVector4), pType->TotalSize)); + memcpy(pData, Data.pVector + Offset, + std::min<size_t>(Count * sizeof(CEffectVector4), pType->TotalSize - (Offset * sizeof(CEffectVector4)))); lExit: return hr; diff --git a/lib/win32/Effects11/Effects11_2013.vcxproj b/lib/win32/Effects11/Effects11_2013.vcxproj index 3cdc19d28f..c2af09dcd4 100644 --- a/lib/win32/Effects11/Effects11_2013.vcxproj +++ b/lib/win32/Effects11/Effects11_2013.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -31,41 +31,38 @@ <ProjectGuid>{DF460EAB-570D-4B50-9089-2E2FC801BF38}</ProjectGuid> <RootNamespace>Effects11</RootNamespace> <Keyword>Win32Proj</Keyword> + <VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and '$(VisualStudioVersion)' == ''">$(VCTargetsPath11)</VCTargetsPath> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> - <CharacterSet>MultiByte</CharacterSet> - <PlatformToolset>v140</PlatformToolset> + <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> - <WholeProgramOptimization>false</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> - <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> - <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> - <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings" /> @@ -89,20 +86,20 @@ </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <OutDir>$(SolutionDir)libs\$(TargetName)\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)objs\$(TargetName)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> + <OutDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</IntDir> + <TargetName>Effects11d</TargetName> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'"> <OutDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</OutDir> <IntDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> + <TargetName>Effects11d</TargetName> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <OutDir>$(SolutionDir)libs\$(TargetName)\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)objs\$(TargetName)\$(Configuration)\</IntDir> + <OutDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</IntDir> <TargetName>Effects11</TargetName> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> </PropertyGroup> @@ -113,8 +110,8 @@ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'"> - <OutDir>$(SolutionDir)libs\$(TargetName)\$(Configuration)\</OutDir> - <IntDir>$(SolutionDir)objs\$(TargetName)\$(Configuration)\</IntDir> + <OutDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\Desktop_2013\$(Platform)\$(Configuration)\</IntDir> <TargetName>Effects11</TargetName> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> </PropertyGroup> @@ -138,8 +135,8 @@ <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> + <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <PrecompiledHeader>Use</PrecompiledHeader> </ClCompile> diff --git a/lib/win32/Effects11/Effects11_2015.vcxproj b/lib/win32/Effects11/Effects11_2015.vcxproj index eca08f9836..a61c3fa3e0 100644 --- a/lib/win32/Effects11/Effects11_2015.vcxproj +++ b/lib/win32/Effects11/Effects11_2015.vcxproj @@ -45,25 +45,21 @@ </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> - <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> - <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> - <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'" Label="Configuration"> <ConfigurationType>StaticLibrary</ConfigurationType> - <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> <PlatformToolset>v140</PlatformToolset> </PropertyGroup> @@ -91,13 +87,13 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir> <IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> + <TargetName>Effects11d</TargetName> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'"> <OutDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</OutDir> <IntDir>Bin\Desktop_2015\$(Platform)\$(Configuration)\</IntDir> - <TargetName>Effects11</TargetName> + <TargetName>Effects11d</TargetName> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -138,7 +134,7 @@ <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <DebugInformationFormat>EditAndContinue</DebugInformationFormat> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <PrecompiledHeader>Use</PrecompiledHeader> @@ -180,7 +176,7 @@ <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <PrecompiledHeader>Use</PrecompiledHeader> </ClCompile> @@ -223,7 +219,7 @@ <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader>Use</PrecompiledHeader> </ClCompile> <Link> @@ -266,7 +262,7 @@ <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader>Use</PrecompiledHeader> </ClCompile> <Link> @@ -310,7 +306,7 @@ <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader>Use</PrecompiledHeader> </ClCompile> <Link> @@ -353,7 +349,7 @@ <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> - <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PrecompiledHeader>Use</PrecompiledHeader> </ClCompile> <Link> diff --git a/lib/win32/Effects11/Effects11_2015_Win10.sln b/lib/win32/Effects11/Effects11_2015_Win10.sln new file mode 100644 index 0000000000..75fb9454cb --- /dev/null +++ b/lib/win32/Effects11/Effects11_2015_Win10.sln @@ -0,0 +1,31 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11", "Effects11_2015_Win10.vcxproj", "{DF460EAB-570D-4B50-9089-2E2FC801BF38}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Profile|Win32 = Profile|Win32 + Profile|x64 = Profile|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.ActiveCfg = Debug|Win32 + {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|Win32.Build.0 = Debug|Win32 + {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.ActiveCfg = Debug|x64 + {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Debug|x64.Build.0 = Debug|x64 + {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|Win32.ActiveCfg = Profile|Win32 + {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|Win32.Build.0 = Profile|Win32 + {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|x64.ActiveCfg = Profile|x64 + {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Profile|x64.Build.0 = Profile|x64 + {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.ActiveCfg = Release|Win32 + {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|Win32.Build.0 = Release|Win32 + {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.ActiveCfg = Release|x64 + {DF460EAB-570D-4B50-9089-2E2FC801BF38}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/lib/win32/Effects11/Effects11_2015_Win10.vcxproj b/lib/win32/Effects11/Effects11_2015_Win10.vcxproj new file mode 100644 index 0000000000..272917fa79 --- /dev/null +++ b/lib/win32/Effects11/Effects11_2015_Win10.vcxproj @@ -0,0 +1,419 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Profile|Win32"> + <Configuration>Profile</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Profile|x64"> + <Configuration>Profile</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectName>Effects11</ProjectName> + <ProjectGuid>{DF460EAB-570D-4B50-9089-2E2FC801BF38}</ProjectGuid> + <RootNamespace>Effects11</RootNamespace> + <Keyword>Win32Proj</Keyword> + <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings" /> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <OutDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</IntDir> + <TargetName>Effects11d</TargetName> + <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'"> + <OutDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</IntDir> + <TargetName>Effects11d</TargetName> + <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <OutDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</IntDir> + <TargetName>Effects11</TargetName> + <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'"> + <OutDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</IntDir> + <TargetName>Effects11</TargetName> + <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'"> + <OutDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</IntDir> + <TargetName>Effects11</TargetName> + <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'"> + <OutDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\Desktop_2015_Win10\$(Platform)\$(Configuration)\</IntDir> + <TargetName>Effects11</TargetName> + <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <WarningLevel>Level4</WarningLevel> + <Optimization>Disabled</Optimization> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <OpenMPSupport>false</OpenMPSupport> + <IntrinsicFunctions>true</IntrinsicFunctions> + <FloatingPointModel>Fast</FloatingPointModel> + <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + <ExceptionHandling>Sync</ExceptionHandling> + <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> + <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> + <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <DebugInformationFormat>EditAndContinue</DebugInformationFormat> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <PrecompiledHeader>Use</PrecompiledHeader> + </ClCompile> + <Link> + <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> + <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <LargeAddressAware>true</LargeAddressAware> + <RandomizedBaseAddress>true</RandomizedBaseAddress> + <DataExecutionPrevention>true</DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + <UACExecutionLevel>AsInvoker</UACExecutionLevel> + <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> + </Link> + <Manifest> + <EnableDPIAwareness>false</EnableDPIAwareness> + </Manifest> + <PreBuildEvent> + <Command> + </Command> + </PreBuildEvent> + <PostBuildEvent> + <Command> + </Command> + </PostBuildEvent> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'"> + <ClCompile> + <WarningLevel>Level4</WarningLevel> + <Optimization>Disabled</Optimization> + <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> + <OpenMPSupport>false</OpenMPSupport> + <IntrinsicFunctions>true</IntrinsicFunctions> + <FloatingPointModel>Fast</FloatingPointModel> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + <ExceptionHandling>Sync</ExceptionHandling> + <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> + <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> + <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> + <PrecompiledHeader>Use</PrecompiledHeader> + </ClCompile> + <Link> + <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> + <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <LargeAddressAware>true</LargeAddressAware> + <RandomizedBaseAddress>true</RandomizedBaseAddress> + <DataExecutionPrevention>true</DataExecutionPrevention> + <TargetMachine>MachineX64</TargetMachine> + <UACExecutionLevel>AsInvoker</UACExecutionLevel> + <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> + </Link> + <Manifest> + <EnableDPIAwareness>false</EnableDPIAwareness> + </Manifest> + <PreBuildEvent> + <Command> + </Command> + </PreBuildEvent> + <PostBuildEvent> + <Command> + </Command> + </PostBuildEvent> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <WarningLevel>Level4</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <OpenMPSupport>false</OpenMPSupport> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <FloatingPointModel>Fast</FloatingPointModel> + <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + <ExceptionHandling>Sync</ExceptionHandling> + <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> + <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> + <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeader>Use</PrecompiledHeader> + </ClCompile> + <Link> + <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> + <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Windows</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <LargeAddressAware>true</LargeAddressAware> + <RandomizedBaseAddress>true</RandomizedBaseAddress> + <DataExecutionPrevention>true</DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + <UACExecutionLevel>AsInvoker</UACExecutionLevel> + <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> + </Link> + <Manifest> + <EnableDPIAwareness>false</EnableDPIAwareness> + </Manifest> + <PreBuildEvent> + <Command> + </Command> + </PreBuildEvent> + <PostBuildEvent> + <Command> + </Command> + </PostBuildEvent> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'"> + <ClCompile> + <WarningLevel>Level4</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <OpenMPSupport>false</OpenMPSupport> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <FloatingPointModel>Fast</FloatingPointModel> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + <ExceptionHandling>Sync</ExceptionHandling> + <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> + <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> + <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeader>Use</PrecompiledHeader> + </ClCompile> + <Link> + <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> + <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Windows</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <LargeAddressAware>true</LargeAddressAware> + <RandomizedBaseAddress>true</RandomizedBaseAddress> + <DataExecutionPrevention>true</DataExecutionPrevention> + <TargetMachine>MachineX64</TargetMachine> + <UACExecutionLevel>AsInvoker</UACExecutionLevel> + <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> + </Link> + <Manifest> + <EnableDPIAwareness>false</EnableDPIAwareness> + </Manifest> + <PreBuildEvent> + <Command> + </Command> + </PreBuildEvent> + <PostBuildEvent> + <Command> + </Command> + </PostBuildEvent> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'"> + <ClCompile> + <WarningLevel>Level4</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <OpenMPSupport>false</OpenMPSupport> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <FloatingPointModel>Fast</FloatingPointModel> + <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + <ExceptionHandling>Sync</ExceptionHandling> + <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> + <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> + <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeader>Use</PrecompiledHeader> + </ClCompile> + <Link> + <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> + <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Windows</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <LargeAddressAware>true</LargeAddressAware> + <RandomizedBaseAddress>true</RandomizedBaseAddress> + <DataExecutionPrevention>true</DataExecutionPrevention> + <TargetMachine>MachineX86</TargetMachine> + <UACExecutionLevel>AsInvoker</UACExecutionLevel> + <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> + </Link> + <Manifest> + <EnableDPIAwareness>false</EnableDPIAwareness> + </Manifest> + <PreBuildEvent> + <Command> + </Command> + </PreBuildEvent> + <PostBuildEvent> + <Command> + </Command> + </PostBuildEvent> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'"> + <ClCompile> + <WarningLevel>Level4</WarningLevel> + <Optimization>MaxSpeed</Optimization> + <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> + <OpenMPSupport>false</OpenMPSupport> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <FloatingPointModel>Fast</FloatingPointModel> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + <ExceptionHandling>Sync</ExceptionHandling> + <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> + <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> + <PreprocessorDefinitions>_WIN7_PLATFORM_UPDATE;WIN32;NDEBUG;PROFILE;_WINDOWS;_LIB;D3DXFX_LARGEADDRESS_HANDLE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PrecompiledHeader>Use</PrecompiledHeader> + </ClCompile> + <Link> + <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions> + <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Windows</SubSystem> + <OptimizeReferences>true</OptimizeReferences> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <LargeAddressAware>true</LargeAddressAware> + <RandomizedBaseAddress>true</RandomizedBaseAddress> + <DataExecutionPrevention>true</DataExecutionPrevention> + <TargetMachine>MachineX64</TargetMachine> + <UACExecutionLevel>AsInvoker</UACExecutionLevel> + <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs> + </Link> + <Manifest> + <EnableDPIAwareness>false</EnableDPIAwareness> + </Manifest> + <PreBuildEvent> + <Command> + </Command> + </PreBuildEvent> + <PostBuildEvent> + <Command> + </Command> + </PostBuildEvent> + </ItemDefinitionGroup> + <ItemGroup /> + <ItemGroup> + <CLInclude Include="pchfx.h" /> + <CLInclude Include=".\Inc\d3dx11effect.h" /> + <CLInclude Include=".\Inc\d3dxglobal.h" /> + <CLInclude Include=".\Binary\EffectBinaryFormat.h" /> + <CLInclude Include=".\Binary\EffectStateBase11.h" /> + <CLInclude Include=".\Binary\EffectStates11.h" /> + <CLInclude Include=".\Binary\SOParser.h" /> + <ClCompile Include="d3dxGlobal.cpp"> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|X64'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|X64'">Create</PrecompiledHeader> + </ClCompile> + <CLInclude Include="Effect.h" /> + <ClCompile Include="EffectAPI.cpp" /> + <ClCompile Include="EffectLoad.cpp" /> + <CLInclude Include="EffectLoad.h" /> + <ClCompile Include="EffectNonRuntime.cpp" /> + <ClCompile Include="EffectReflection.cpp" /> + <ClCompile Include="EffectRuntime.cpp" /> + <None Include="EffectVariable.inl" /> + <CLInclude Include="IUnknownImp.h" /> + </ItemGroup> + <ItemGroup> + </ItemGroup> + <ItemGroup> + </ItemGroup> + <ItemGroup> + </ItemGroup> + <ItemGroup> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets" /> +</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Effects11_2015_Win10.vcxproj.filters b/lib/win32/Effects11/Effects11_2015_Win10.vcxproj.filters new file mode 100644 index 0000000000..c49ec9dff9 --- /dev/null +++ b/lib/win32/Effects11/Effects11_2015_Win10.vcxproj.filters @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns:atg="http://atg.xbox.com" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Resource Files"> + <UniqueIdentifier>{8e114980-c1a3-4ada-ad7c-83caadf5daeb}</UniqueIdentifier> + <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions> + </Filter> + </ItemGroup> + <ItemGroup /> + <ItemGroup> + <CLInclude Include="pchfx.h" /> + <CLInclude Include=".\Inc\d3dx11effect.h" /> + <CLInclude Include=".\Inc\d3dxglobal.h" /> + <CLInclude Include=".\Binary\EffectBinaryFormat.h" /> + <CLInclude Include=".\Binary\EffectStateBase11.h" /> + <CLInclude Include=".\Binary\EffectStates11.h" /> + <CLInclude Include=".\Binary\SOParser.h" /> + <ClCompile Include="d3dxGlobal.cpp" /> + <CLInclude Include="Effect.h" /> + <ClCompile Include="EffectAPI.cpp" /> + <ClCompile Include="EffectLoad.cpp" /> + <CLInclude Include="EffectLoad.h" /> + <ClCompile Include="EffectNonRuntime.cpp" /> + <ClCompile Include="EffectReflection.cpp" /> + <ClCompile Include="EffectRuntime.cpp" /> + <None Include="EffectVariable.inl" /> + <CLInclude Include="IUnknownImp.h" /> + </ItemGroup> + <ItemGroup> + </ItemGroup> + <ItemGroup> + </ItemGroup> + <ItemGroup> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Effects11_Windows10.sln b/lib/win32/Effects11/Effects11_Windows10.sln new file mode 100644 index 0000000000..49848ccb1b --- /dev/null +++ b/lib/win32/Effects11/Effects11_Windows10.sln @@ -0,0 +1,34 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.22609.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11", "Effects11_Windows10.vcxproj", "{9188BD60-F60C-4A40-98CF-F704E467D775}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM = Debug|ARM + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|ARM = Release|ARM + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9188BD60-F60C-4A40-98CF-F704E467D775}.Debug|ARM.ActiveCfg = Debug|ARM + {9188BD60-F60C-4A40-98CF-F704E467D775}.Debug|ARM.Build.0 = Debug|ARM + {9188BD60-F60C-4A40-98CF-F704E467D775}.Debug|x64.ActiveCfg = Debug|x64 + {9188BD60-F60C-4A40-98CF-F704E467D775}.Debug|x64.Build.0 = Debug|x64 + {9188BD60-F60C-4A40-98CF-F704E467D775}.Debug|x86.ActiveCfg = Debug|Win32 + {9188BD60-F60C-4A40-98CF-F704E467D775}.Debug|x86.Build.0 = Debug|Win32 + {9188BD60-F60C-4A40-98CF-F704E467D775}.Release|ARM.ActiveCfg = Release|ARM + {9188BD60-F60C-4A40-98CF-F704E467D775}.Release|ARM.Build.0 = Release|ARM + {9188BD60-F60C-4A40-98CF-F704E467D775}.Release|x64.ActiveCfg = Release|x64 + {9188BD60-F60C-4A40-98CF-F704E467D775}.Release|x64.Build.0 = Release|x64 + {9188BD60-F60C-4A40-98CF-F704E467D775}.Release|x86.ActiveCfg = Release|Win32 + {9188BD60-F60C-4A40-98CF-F704E467D775}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/lib/win32/Effects11/Effects11_Windows10.vcxproj b/lib/win32/Effects11/Effects11_Windows10.vcxproj new file mode 100644 index 0000000000..4e4a88f0bf --- /dev/null +++ b/lib/win32/Effects11/Effects11_Windows10.vcxproj @@ -0,0 +1,257 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|ARM"> + <Configuration>Debug</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|ARM"> + <Configuration>Release</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <ItemGroup> + <ClInclude Include="Binary\EffectBinaryFormat.h" /> + <ClInclude Include="Binary\EffectStateBase11.h" /> + <ClInclude Include="Binary\EffectStates11.h" /> + <ClInclude Include="Binary\SOParser.h" /> + <ClInclude Include="Effect.h" /> + <ClInclude Include="EffectLoad.h" /> + <ClInclude Include="inc\d3dx11effect.h" /> + <ClInclude Include="inc\d3dxGlobal.h" /> + <ClInclude Include="IUnknownImp.h" /> + <ClInclude Include="pchfx.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="d3dxGlobal.cpp"> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader> + </ClCompile> + <ClCompile Include="EffectAPI.cpp" /> + <ClCompile Include="EffectLoad.cpp" /> + <ClCompile Include="EffectNonRuntime.cpp" /> + <ClCompile Include="EffectReflection.cpp" /> + <ClCompile Include="EffectRuntime.cpp" /> + </ItemGroup> + <ItemGroup> + <None Include="EffectVariable.inl" /> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{9188bd60-f60c-4a40-98cf-f704e467d775}</ProjectGuid> + <Keyword>StaticLibrary</Keyword> + <ProjectName>Effects11</ProjectName> + <RootNamespace>Effects11</RootNamespace> + <DefaultLanguage>en-US</DefaultLanguage> + <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion> + <AppContainerApplication>true</AppContainerApplication> + <ApplicationType>Windows Store</ApplicationType> + <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion> + <WindowsTargetPlatformMinVersion>10.0.10586.0</WindowsTargetPlatformMinVersion> + <ApplicationTypeRevision>10.0</ApplicationTypeRevision> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v140</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <ImportGroup Label="Shared"> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <OutDir>Bin\Windows10\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\Windows10\$(Platform)\$(Configuration)\</IntDir> + <TargetName>Effects11d</TargetName> + <GenerateManifest>false</GenerateManifest> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <OutDir>Bin\Windows10\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\Windows10\$(Platform)\$(Configuration)\</IntDir> + <TargetName>Effects11</TargetName> + <GenerateManifest>false</GenerateManifest> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> + <OutDir>Bin\Windows10\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\Windows10\$(Platform)\$(Configuration)\</IntDir> + <TargetName>Effects11d</TargetName> + <GenerateManifest>false</GenerateManifest> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> + <OutDir>Bin\Windows10\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\Windows10\$(Platform)\$(Configuration)\</IntDir> + <TargetName>Effects11</TargetName> + <GenerateManifest>false</GenerateManifest> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <OutDir>Bin\Windows10\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\Windows10\$(Platform)\$(Configuration)\</IntDir> + <TargetName>Effects11d</TargetName> + <GenerateManifest>false</GenerateManifest> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <OutDir>Bin\Windows10\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\Windows10\$(Platform)\$(Configuration)\</IntDir> + <TargetName>Effects11</TargetName> + <GenerateManifest>false</GenerateManifest> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>Use</PrecompiledHeader> + <CompileAsWinRT>false</CompileAsWinRT> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>Use</PrecompiledHeader> + <CompileAsWinRT>false</CompileAsWinRT> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'"> + <ClCompile> + <PrecompiledHeader>Use</PrecompiledHeader> + <CompileAsWinRT>false</CompileAsWinRT> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'"> + <ClCompile> + <PrecompiledHeader>Use</PrecompiledHeader> + <CompileAsWinRT>false</CompileAsWinRT> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <PrecompiledHeader>Use</PrecompiledHeader> + <CompileAsWinRT>false</CompileAsWinRT> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <PrecompiledHeader>Use</PrecompiledHeader> + <CompileAsWinRT>false</CompileAsWinRT> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Effects11_Windows10.vcxproj.filters b/lib/win32/Effects11/Effects11_Windows10.vcxproj.filters new file mode 100644 index 0000000000..3fa56c5eba --- /dev/null +++ b/lib/win32/Effects11/Effects11_Windows10.vcxproj.filters @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClInclude Include="Binary\EffectBinaryFormat.h" /> + <ClInclude Include="Binary\EffectStateBase11.h" /> + <ClInclude Include="Binary\EffectStates11.h" /> + <ClInclude Include="Binary\SOParser.h" /> + <ClInclude Include="inc\d3dx11effect.h" /> + <ClInclude Include="inc\d3dxGlobal.h" /> + <ClInclude Include="Effect.h" /> + <ClInclude Include="EffectLoad.h" /> + <ClInclude Include="IUnknownImp.h" /> + <ClInclude Include="pchfx.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="d3dxGlobal.cpp" /> + <ClCompile Include="EffectAPI.cpp" /> + <ClCompile Include="EffectLoad.cpp" /> + <ClCompile Include="EffectNonRuntime.cpp" /> + <ClCompile Include="EffectReflection.cpp" /> + <ClCompile Include="EffectRuntime.cpp" /> + </ItemGroup> + <ItemGroup> + <None Include="EffectVariable.inl" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Effects11_Windows81.sln b/lib/win32/Effects11/Effects11_Windows81.sln new file mode 100644 index 0000000000..d23799f25f --- /dev/null +++ b/lib/win32/Effects11/Effects11_Windows81.sln @@ -0,0 +1,34 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.21005.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11_Windows81", "Effects11_Windows81.vcxproj", "{3218B7F0-ABB8-47C3-8036-B61756E8ACC3}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM = Debug|ARM + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|ARM = Release|ARM + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Debug|ARM.ActiveCfg = Debug|ARM + {3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Debug|ARM.Build.0 = Debug|ARM + {3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Debug|Win32.ActiveCfg = Debug|Win32 + {3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Debug|Win32.Build.0 = Debug|Win32 + {3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Debug|x64.ActiveCfg = Debug|x64 + {3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Debug|x64.Build.0 = Debug|x64 + {3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Release|ARM.ActiveCfg = Release|ARM + {3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Release|ARM.Build.0 = Release|ARM + {3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Release|Win32.ActiveCfg = Release|Win32 + {3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Release|Win32.Build.0 = Release|Win32 + {3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Release|x64.ActiveCfg = Release|x64 + {3218B7F0-ABB8-47C3-8036-B61756E8ACC3}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/lib/win32/Effects11/Effects11_Windows81.vcxproj b/lib/win32/Effects11/Effects11_Windows81.vcxproj new file mode 100644 index 0000000000..bf23d712d8 --- /dev/null +++ b/lib/win32/Effects11/Effects11_Windows81.vcxproj @@ -0,0 +1,239 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|ARM"> + <Configuration>Debug</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|x64"> + <Configuration>Debug</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|ARM"> + <Configuration>Release</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|x64"> + <Configuration>Release</Configuration> + <Platform>x64</Platform> + </ProjectConfiguration> + </ItemGroup> + <ItemGroup> + <ClInclude Include="Binary\EffectBinaryFormat.h" /> + <ClInclude Include="Binary\EffectStateBase11.h" /> + <ClInclude Include="Binary\EffectStates11.h" /> + <ClInclude Include="Binary\SOParser.h" /> + <ClInclude Include="Effect.h" /> + <ClInclude Include="EffectLoad.h" /> + <ClInclude Include="inc\d3dx11effect.h" /> + <ClInclude Include="inc\d3dxGlobal.h" /> + <ClInclude Include="IUnknownImp.h" /> + <ClInclude Include="pchfx.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="d3dxGlobal.cpp"> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader> + </ClCompile> + <ClCompile Include="EffectAPI.cpp" /> + <ClCompile Include="EffectLoad.cpp" /> + <ClCompile Include="EffectNonRuntime.cpp" /> + <ClCompile Include="EffectReflection.cpp" /> + <ClCompile Include="EffectRuntime.cpp" /> + </ItemGroup> + <ItemGroup> + <None Include="EffectVariable.inl" /> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{3218b7f0-abb8-47c3-8036-b61756e8acc3}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <ProjectName>Effects11_Windows81</ProjectName> + <RootNamespace>Effects11_Windows81</RootNamespace> + <DefaultLanguage>en-US</DefaultLanguage> + <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion> + <AppContainerApplication>true</AppContainerApplication> + <ApplicationType>Windows Store</ApplicationType> + <ApplicationTypeRevision>8.1</ApplicationTypeRevision> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v120</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <OutDir>Bin\Windows81\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\Windows81\$(Platform)\$(Configuration)\</IntDir> + <TargetName>Effects11d</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <OutDir>Bin\Windows81\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\Windows81\$(Platform)\$(Configuration)\</IntDir> + <TargetName>Effects11</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> + <OutDir>Bin\Windows81\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\Windows81\$(Platform)\$(Configuration)\</IntDir> + <TargetName>Effects11d</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> + <OutDir>Bin\Windows81\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\Windows81\$(Platform)\$(Configuration)\</IntDir> + <TargetName>Effects11</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <OutDir>Bin\Windows81\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\Windows81\$(Platform)\$(Configuration)\</IntDir> + <TargetName>Effects11d</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <OutDir>Bin\Windows81\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\Windows81\$(Platform)\$(Configuration)\</IntDir> + <TargetName>Effects11</TargetName> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <CompileAsWinRT>false</CompileAsWinRT> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <CompileAsWinRT>false</CompileAsWinRT> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'"> + <ClCompile> + <CompileAsWinRT>false</CompileAsWinRT> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'"> + <ClCompile> + <CompileAsWinRT>false</CompileAsWinRT> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> + <ClCompile> + <CompileAsWinRT>false</CompileAsWinRT> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> + <ClCompile> + <CompileAsWinRT>false</CompileAsWinRT> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Effects11_Windows81.vcxproj.filters b/lib/win32/Effects11/Effects11_Windows81.vcxproj.filters new file mode 100644 index 0000000000..9afb7a7d9c --- /dev/null +++ b/lib/win32/Effects11/Effects11_Windows81.vcxproj.filters @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <Filter Include="Resource Files"> + <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> + <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> + </Filter> + </ItemGroup> + <ItemGroup> + <ClInclude Include="inc\d3dx11effect.h" /> + <ClInclude Include="inc\d3dxGlobal.h" /> + <ClInclude Include="Binary\EffectBinaryFormat.h" /> + <ClInclude Include="Binary\EffectStateBase11.h" /> + <ClInclude Include="Binary\EffectStates11.h" /> + <ClInclude Include="Binary\SOParser.h" /> + <ClInclude Include="Effect.h" /> + <ClInclude Include="EffectLoad.h" /> + <ClInclude Include="IUnknownImp.h" /> + <ClInclude Include="pchfx.h" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="d3dxGlobal.cpp" /> + <ClCompile Include="EffectAPI.cpp" /> + <ClCompile Include="EffectLoad.cpp" /> + <ClCompile Include="EffectNonRuntime.cpp" /> + <ClCompile Include="EffectReflection.cpp" /> + <ClCompile Include="EffectRuntime.cpp" /> + </ItemGroup> + <ItemGroup> + <None Include="EffectVariable.inl" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Effects11_WindowsPhone81.sln b/lib/win32/Effects11/Effects11_WindowsPhone81.sln new file mode 100644 index 0000000000..dfeae75e09 --- /dev/null +++ b/lib/win32/Effects11/Effects11_WindowsPhone81.sln @@ -0,0 +1,28 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.30501.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11_WindowsPhone81", "Effects11_WindowsPhone81.vcxproj", "{961262DB-696C-48AF-BD8C-A080FC64C3F1}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM = Debug|ARM + Debug|Win32 = Debug|Win32 + Release|ARM = Release|ARM + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {961262DB-696C-48AF-BD8C-A080FC64C3F1}.Debug|ARM.ActiveCfg = Debug|ARM + {961262DB-696C-48AF-BD8C-A080FC64C3F1}.Debug|ARM.Build.0 = Debug|ARM + {961262DB-696C-48AF-BD8C-A080FC64C3F1}.Debug|Win32.ActiveCfg = Debug|Win32 + {961262DB-696C-48AF-BD8C-A080FC64C3F1}.Debug|Win32.Build.0 = Debug|Win32 + {961262DB-696C-48AF-BD8C-A080FC64C3F1}.Release|ARM.ActiveCfg = Release|ARM + {961262DB-696C-48AF-BD8C-A080FC64C3F1}.Release|ARM.Build.0 = Release|ARM + {961262DB-696C-48AF-BD8C-A080FC64C3F1}.Release|Win32.ActiveCfg = Release|Win32 + {961262DB-696C-48AF-BD8C-A080FC64C3F1}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/lib/win32/Effects11/Effects11_WindowsPhone81.vcxproj b/lib/win32/Effects11/Effects11_WindowsPhone81.vcxproj new file mode 100644 index 0000000000..898ae61976 --- /dev/null +++ b/lib/win32/Effects11/Effects11_WindowsPhone81.vcxproj @@ -0,0 +1,180 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Debug|Win32"> + <Configuration>Debug</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|Win32"> + <Configuration>Release</Configuration> + <Platform>Win32</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|ARM"> + <Configuration>Debug</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Release|ARM"> + <Configuration>Release</Configuration> + <Platform>ARM</Platform> + </ProjectConfiguration> + </ItemGroup> + <ItemGroup> + <ClInclude Include="Binary\EffectBinaryFormat.h" /> + <ClInclude Include="Binary\EffectStateBase11.h" /> + <ClInclude Include="Binary\EffectStates11.h" /> + <ClInclude Include="Binary\SOParser.h" /> + <ClInclude Include="Effect.h" /> + <ClInclude Include="EffectLoad.h" /> + <ClInclude Include="inc\d3dx11effect.h" /> + <ClInclude Include="inc\d3dxGlobal.h" /> + <ClInclude Include="IUnknownImp.h" /> + <ClInclude Include="pchfx.h" /> + </ItemGroup> + <ItemGroup> + <None Include="EffectVariable.inl" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="d3dxGlobal.cpp"> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader> + </ClCompile> + <ClCompile Include="EffectAPI.cpp" /> + <ClCompile Include="EffectLoad.cpp" /> + <ClCompile Include="EffectNonRuntime.cpp" /> + <ClCompile Include="EffectReflection.cpp" /> + <ClCompile Include="EffectRuntime.cpp" /> + </ItemGroup> + <PropertyGroup Label="Globals"> + <ProjectGuid>{961262db-696c-48af-bd8c-a080fc64c3f1}</ProjectGuid> + <Keyword>Win32Proj</Keyword> + <ProjectName>Effects11</ProjectName> + <RootNamespace>Effects11</RootNamespace> + <DefaultLanguage>en-US</DefaultLanguage> + <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion> + <AppContainerApplication>true</AppContainerApplication> + <ApplicationType>Windows Phone</ApplicationType> + <ApplicationTypeRevision>8.1</ApplicationTypeRevision> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v120_wp81</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v120_wp81</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>true</UseDebugLibraries> + <PlatformToolset>v120_wp81</PlatformToolset> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <UseDebugLibraries>false</UseDebugLibraries> + <PlatformToolset>v120_wp81</PlatformToolset> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> + <IntDir>Bin\WindowsPhone81\$(Platform)\$(Configuration)\</IntDir> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <OutDir>Bin\WindowsPhone81\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\WindowsPhone81\$(Platform)\$(Configuration)\</IntDir> + <TargetName>Effects11d</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <OutDir>Bin\WindowsPhone81\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\WindowsPhone81\$(Platform)\$(Configuration)\</IntDir> + <TargetName>Effects11</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> + <OutDir>Bin\WindowsPhone81\$(Platform)\$(Configuration)\</OutDir> + <TargetName>Effects11d</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> + <OutDir>Bin\WindowsPhone81\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\WindowsPhone81\$(Platform)\$(Configuration)\</IntDir> + <TargetName>Effects11</TargetName> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> + <ClCompile> + <PrecompiledHeader>Use</PrecompiledHeader> + <CompileAsWinRT>false</CompileAsWinRT> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> + <ClCompile> + <PrecompiledHeader>Use</PrecompiledHeader> + <CompileAsWinRT>false</CompileAsWinRT> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> + <ClCompile> + <PrecompiledHeader>Use</PrecompiledHeader> + <CompileAsWinRT>false</CompileAsWinRT> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> + <ClCompile> + <PrecompiledHeader>Use</PrecompiledHeader> + <CompileAsWinRT>false</CompileAsWinRT> + <SDLCheck>true</SDLCheck> + <AdditionalIncludeDirectories>.\Binary;.\Inc;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + </ClCompile> + <Link> + <SubSystem>Console</SubSystem> + <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + </ItemDefinitionGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Effects11_WindowsPhone81.vcxproj.filters b/lib/win32/Effects11/Effects11_WindowsPhone81.vcxproj.filters new file mode 100644 index 0000000000..8eb5a2b883 --- /dev/null +++ b/lib/win32/Effects11/Effects11_WindowsPhone81.vcxproj.filters @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClInclude Include="Effect.h" /> + <ClInclude Include="EffectLoad.h" /> + <ClInclude Include="IUnknownImp.h" /> + <ClInclude Include="pchfx.h" /> + <ClInclude Include="inc\d3dx11effect.h" /> + <ClInclude Include="inc\d3dxGlobal.h" /> + <ClInclude Include="Binary\EffectBinaryFormat.h" /> + <ClInclude Include="Binary\EffectStateBase11.h" /> + <ClInclude Include="Binary\EffectStates11.h" /> + <ClInclude Include="Binary\SOParser.h" /> + </ItemGroup> + <ItemGroup> + <None Include="EffectVariable.inl" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="d3dxGlobal.cpp" /> + <ClCompile Include="EffectAPI.cpp" /> + <ClCompile Include="EffectLoad.cpp" /> + <ClCompile Include="EffectNonRuntime.cpp" /> + <ClCompile Include="EffectReflection.cpp" /> + <ClCompile Include="EffectRuntime.cpp" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Effects11_XboxOneXDK_2015.sln b/lib/win32/Effects11/Effects11_XboxOneXDK_2015.sln new file mode 100644 index 0000000000..8890daa901 --- /dev/null +++ b/lib/win32/Effects11/Effects11_XboxOneXDK_2015.sln @@ -0,0 +1,23 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Effects11", "Effects11_XboxOneXDK_2015.vcxproj", "{A2D70D23-3516-40EC-B831-2FAD3DAFD8B7}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Durango = Debug|Durango + Profile|Durango = Profile|Durango + Release|Durango = Release|Durango + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A2D70D23-3516-40EC-B831-2FAD3DAFD8B7}.Debug|Durango.ActiveCfg = Debug|Durango + {A2D70D23-3516-40EC-B831-2FAD3DAFD8B7}.Debug|Durango.Build.0 = Debug|Durango + {A2D70D23-3516-40EC-B831-2FAD3DAFD8B7}.Profile|Durango.ActiveCfg = Profile|Durango + {A2D70D23-3516-40EC-B831-2FAD3DAFD8B7}.Profile|Durango.Build.0 = Profile|Durango + {A2D70D23-3516-40EC-B831-2FAD3DAFD8B7}.Release|Durango.ActiveCfg = Release|Durango + {A2D70D23-3516-40EC-B831-2FAD3DAFD8B7}.Release|Durango.Build.0 = Release|Durango + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/lib/win32/Effects11/Effects11_XboxOneXDK_2015.vcxproj b/lib/win32/Effects11/Effects11_XboxOneXDK_2015.vcxproj new file mode 100644 index 0000000000..bdff627c01 --- /dev/null +++ b/lib/win32/Effects11/Effects11_XboxOneXDK_2015.vcxproj @@ -0,0 +1,197 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup Label="ProjectConfigurations"> + <ProjectConfiguration Include="Release|Durango"> + <Configuration>Release</Configuration> + <Platform>Durango</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Profile|Durango"> + <Configuration>Profile</Configuration> + <Platform>Durango</Platform> + </ProjectConfiguration> + <ProjectConfiguration Include="Debug|Durango"> + <Configuration>Debug</Configuration> + <Platform>Durango</Platform> + </ProjectConfiguration> + </ItemGroup> + <PropertyGroup Label="Globals"> + <RootNamespace>Effects11</RootNamespace> + <ProjectGuid>{a2d70d23-3516-40ec-b831-2fad3dafd8b7}</ProjectGuid> + <DefaultLanguage>en-US</DefaultLanguage> + <Keyword>Win32Proj</Keyword> + <ApplicationEnvironment>title</ApplicationEnvironment> + <ProjectName>Effects11</ProjectName> + <!-- - - - --> + <PlatformToolset>v110</PlatformToolset> + <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion> + <TargetRuntime>Native</TargetRuntime> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Durango'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v140</PlatformToolset> + <UseDebugLibraries>false</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> + <EmbedManifest>false</EmbedManifest> + <GenerateManifest>false</GenerateManifest> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Durango'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v140</PlatformToolset> + <UseDebugLibraries>false</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> + <EmbedManifest>false</EmbedManifest> + <GenerateManifest>false</GenerateManifest> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'" Label="Configuration"> + <ConfigurationType>StaticLibrary</ConfigurationType> + <PlatformToolset>v140</PlatformToolset> + <UseDebugLibraries>true</UseDebugLibraries> + <CharacterSet>Unicode</CharacterSet> + <EmbedManifest>false</EmbedManifest> + <GenerateManifest>false</GenerateManifest> + </PropertyGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> + <ImportGroup Label="ExtensionSettings"> + </ImportGroup> + <PropertyGroup Label="UserMacros" /> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Durango'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Durango'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'" Label="PropertySheets"> + <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> + </ImportGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Durango'"> + <ReferencePath>$(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath)</ReferencePath> + <LibraryPath>$(Console_SdkLibPath)</LibraryPath> + <LibraryWPath>$(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath)</LibraryWPath> + <IncludePath>$(Console_SdkIncludeRoot)</IncludePath> + <ExecutablePath>$(Console_SdkRoot)bin;$(VCInstallDir)bin\x86_amd64;$(VCInstallDir)bin;$(WindowsSDK_ExecutablePath_x86);$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(MSBuildToolsPath32);$(FxCopDir);$(PATH);</ExecutablePath> + <OutDir>Bin\XboxOneXDK\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\XboxOneXDK\$(Platform)\$(Configuration)\</IntDir> + <TargetName>Effects11</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Durango'"> + <ReferencePath>$(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath)</ReferencePath> + <LibraryPath>$(Console_SdkLibPath)</LibraryPath> + <LibraryWPath>$(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath)</LibraryWPath> + <IncludePath>$(Console_SdkIncludeRoot)</IncludePath> + <ExecutablePath>$(Console_SdkRoot)bin;$(VCInstallDir)bin\x86_amd64;$(VCInstallDir)bin;$(WindowsSDK_ExecutablePath_x86);$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(MSBuildToolsPath32);$(FxCopDir);$(PATH);</ExecutablePath> + <OutDir>Bin\XboxOneXDK\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\XboxOneXDK\$(Platform)\$(Configuration)\</IntDir> + <TargetName>Effects11</TargetName> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'"> + <ReferencePath>$(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath)</ReferencePath> + <LibraryPath>$(Console_SdkLibPath)</LibraryPath> + <LibraryWPath>$(Console_SdkLibPath);$(Console_SdkWindowsMetadataPath)</LibraryWPath> + <IncludePath>$(Console_SdkIncludeRoot)</IncludePath> + <ExecutablePath>$(Console_SdkRoot)bin;$(VCInstallDir)bin\x86_amd64;$(VCInstallDir)bin;$(WindowsSDK_ExecutablePath_x86);$(VSInstallDir)Common7\Tools\bin;$(VSInstallDir)Common7\tools;$(VSInstallDir)Common7\ide;$(ProgramFiles)\HTML Help Workshop;$(MSBuildToolsPath32);$(FxCopDir);$(PATH);</ExecutablePath> + <OutDir>Bin\XboxOneXDK\$(Platform)\$(Configuration)\</OutDir> + <IntDir>Bin\XboxOneXDK\$(Platform)\$(Configuration)\</IntDir> + <TargetName>Effects11d</TargetName> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Durango'"> + <Link> + <AdditionalDependencies>d3d11_x.lib;combase.lib;kernelx.lib;uuid.lib;</AdditionalDependencies> + <EntryPointSymbol> + </EntryPointSymbol> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Windows</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + <ClCompile> + <PrecompiledHeader>Use</PrecompiledHeader> + <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> + <AdditionalUsingDirectories>$(Console_SdkPackagesRoot);$(Console_SdkWindowsMetadataPath);%(AdditionalUsingDirectories)</AdditionalUsingDirectories> + <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>NDEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <WarningLevel>Level4</WarningLevel> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <CompileAsWinRT>false</CompileAsWinRT> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Durango'"> + <Link> + <AdditionalDependencies>pixEvt.lib;d3d11_x.lib;combase.lib;kernelx.lib;uuid.lib;</AdditionalDependencies> + <EntryPointSymbol> + </EntryPointSymbol> + <GenerateDebugInformation>true</GenerateDebugInformation> + <SubSystem>Windows</SubSystem> + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + <ClCompile> + <PrecompiledHeader>Use</PrecompiledHeader> + <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> + <AdditionalUsingDirectories>$(Console_SdkPackagesRoot);$(Console_SdkWindowsMetadataPath);%(AdditionalUsingDirectories)</AdditionalUsingDirectories> + <Optimization>MaxSpeed</Optimization> + <PreprocessorDefinitions>NDEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;PROFILE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <WarningLevel>Level4</WarningLevel> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> + <CompileAsWinRT>false</CompileAsWinRT> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + </ItemDefinitionGroup> + <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'"> + <Link> + <AdditionalDependencies>d3d11_x.lib;combase.lib;kernelx.lib;uuid.lib;</AdditionalDependencies> + <SubSystem>Windows</SubSystem> + <GenerateDebugInformation>true</GenerateDebugInformation> + <GenerateWindowsMetadata>false</GenerateWindowsMetadata> + </Link> + <ClCompile> + <PrecompiledHeader>Use</PrecompiledHeader> + <PrecompiledHeaderFile>pchfx.h</PrecompiledHeaderFile> + <MinimalRebuild>false</MinimalRebuild> + <AdditionalUsingDirectories>$(Console_SdkPackagesRoot);$(Console_SdkWindowsMetadataPath);%(AdditionalUsingDirectories)</AdditionalUsingDirectories> + <WarningLevel>Level4</WarningLevel> + <Optimization>Disabled</Optimization> + <PreprocessorDefinitions>_DEBUG;__WRL_NO_DEFAULT_LIB__;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <CompileAsWinRT>false</CompileAsWinRT> + <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName> + <AdditionalIncludeDirectories>.\Binary;.\Inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + </ItemDefinitionGroup> + <ItemGroup> + <ClInclude Include="Binary\EffectBinaryFormat.h" /> + <ClInclude Include="Binary\EffectStateBase11.h" /> + <ClInclude Include="Binary\EffectStates11.h" /> + <ClInclude Include="Binary\SOParser.h" /> + <ClInclude Include="Effect.h" /> + <ClInclude Include="EffectLoad.h" /> + <ClInclude Include="inc\d3dx11effect.h" /> + <ClInclude Include="inc\d3dxGlobal.h" /> + <ClInclude Include="IUnknownImp.h" /> + <ClInclude Include="pchfx.h" /> + </ItemGroup> + <ItemGroup> + <None Include="EffectVariable.inl" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="d3dxGlobal.cpp"> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Durango'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Durango'">Create</PrecompiledHeader> + <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Profile|Durango'">Create</PrecompiledHeader> + </ClCompile> + <ClCompile Include="EffectAPI.cpp" /> + <ClCompile Include="EffectLoad.cpp" /> + <ClCompile Include="EffectNonRuntime.cpp" /> + <ClCompile Include="EffectReflection.cpp" /> + <ClCompile Include="EffectRuntime.cpp" /> + </ItemGroup> + <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> + <ImportGroup Label="ExtensionTargets"> + </ImportGroup> +</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/Effects11_XboxOneXDK_2015.vcxproj.filters b/lib/win32/Effects11/Effects11_XboxOneXDK_2015.vcxproj.filters new file mode 100644 index 0000000000..6a558f0b68 --- /dev/null +++ b/lib/win32/Effects11/Effects11_XboxOneXDK_2015.vcxproj.filters @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ItemGroup> + <ClInclude Include="Binary\EffectBinaryFormat.h" /> + <ClInclude Include="Binary\EffectStateBase11.h" /> + <ClInclude Include="Binary\EffectStates11.h" /> + <ClInclude Include="Binary\SOParser.h" /> + <ClInclude Include="inc\d3dx11effect.h" /> + <ClInclude Include="inc\d3dxGlobal.h" /> + <ClInclude Include="Effect.h" /> + <ClInclude Include="EffectLoad.h" /> + <ClInclude Include="IUnknownImp.h" /> + <ClInclude Include="pchfx.h" /> + </ItemGroup> + <ItemGroup> + <None Include="EffectVariable.inl" /> + </ItemGroup> + <ItemGroup> + <ClCompile Include="d3dxGlobal.cpp" /> + <ClCompile Include="EffectAPI.cpp" /> + <ClCompile Include="EffectLoad.cpp" /> + <ClCompile Include="EffectNonRuntime.cpp" /> + <ClCompile Include="EffectReflection.cpp" /> + <ClCompile Include="EffectRuntime.cpp" /> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/lib/win32/Effects11/MIT.txt b/lib/win32/Effects11/MIT.txt new file mode 100644 index 0000000000..1abfa2b096 --- /dev/null +++ b/lib/win32/Effects11/MIT.txt @@ -0,0 +1,21 @@ + The MIT License (MIT) + +Copyright (c) 2016 Microsoft Corp + +Permission is hereby granted, free of charge, to any person obtaining a copy of this +software and associated documentation files (the "Software"), to deal in the Software +without restriction, including without limitation the rights to use, copy, modify, +merge, publish, distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be included in all copies +or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF +CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE +OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + diff --git a/lib/win32/Effects11/ReadMe.txt b/lib/win32/Effects11/ReadMe.txt new file mode 100644 index 0000000000..9e32f234b0 --- /dev/null +++ b/lib/win32/Effects11/ReadMe.txt @@ -0,0 +1,143 @@ +EFFECTS FOR DIRECT3D 11 (FX11) +------------------------------ + +Copyright (c) Microsoft Corporation. All rights reserved. + +August 1, 2016 + +Effects for Direct3D 11 (FX11) is a management runtime for authoring HLSL shaders, render +state, and runtime variables together. + +The source is written for Visual Studio 2013 or 2015. It is recommended that you +make use of VS 2013 Update 5, VS 2015 Update 2, and Windows 7 Service Pack 1 or later. + +These components are designed to work without requiring any content from the DirectX SDK. For details, +see "Where is the DirectX SDK?" <http://msdn.microsoft.com/en-us/library/ee663275.aspx>. + +All content and source code for this package are subject to the terms of the MIT License. +<http://opensource.org/licenses/MIT>. + +For the latest version of FX11, more detailed documentation, etc., please visit the project site. + +http://go.microsoft.com/fwlink/p/?LinkId=271568 + +This project has adopted the Microsoft Open Source Code of Conduct. For more information see the +Code of Conduct FAQ or contact opencode@microsoft.com with any additional questions or comments. + +https://opensource.microsoft.com/codeofconduct/ + + +------- +SAMPLES +------- + +Direct3D Tutorial 11-14 +BasicHLSLFX11, DynamicShaderLinkageFX11, FixedFuncEMUFX11, InstancingFX11 + +These samples are hosted on GitHub <https://github.com/walbourn/directx-sdk-samples> + + +---------- +DISCLAIMER +---------- + +Effects 11 is being provided as a porting aid for older code that makes use of the Effects 10 (FX10) API or Effects 9 (FX9) +API in the deprecated D3DX9 library. See MSDN for a list of differences compared to the Effects 10 (FX10) library. + +https://msdn.microsoft.com/en-us/library/windows/desktop/ff476141.aspx + +The Effects 11 library is for use in Win32 desktop applications. FX11 requires the D3DCompiler API be available at runtime +to provide shader reflection functionality, and this API is not deployable for Windows Store apps on Windows 8.0, Windows RT, +or Windows phone 8.0. + +The fx_5_0 profile support in the HLSL compiler is deprecated, and does not fully support DirectX 11.1 HLSL features +such as minimum precision types. It is supported in the Windows 8.1 SDK version of the HLSL compiler (FXC.EXE) and +D3DCompile API (#46), is supported but generates a deprecation warning with D3DCompile API (#47), and could be removed +in a future update. + + +--------------- +RELEASE HISTORY +--------------- + +August 2, 2016 (11.17) + Updated for VS 2015 Update 3 and Windows 10 SDK (14393) + Added 'D' suffix to debug libraries per request + +April 26, 2016 (11.16) + Retired VS 2012 projects + Minor code and project file cleanup + +November 30, 2015 (11.15) + Updated for VS 2015 Update 1 and Windows 10 SDK (10586) + +July 29, 2015 (11.14) + Updated for VS 2015 and Windows 10 SDK RTM + Retired VS 2010 projects + +June 17, 2015 (11.13) + Fix for Get/SetFloatVectorArray with an offset + +April 14, 2015 (11.12) + More updates for VS 2015 + +November 24, 2014 (11.11) + Updates for Visual Studio 2015 Technical Preview + +July 15, 2014 (11.10) + Minor code review fixes + +January 24, 2014 (11.09) + VS 2010 projects now require Windows 8.1 SDK + Added pragma for needed libs to public header + Minor code cleanup + +October 21, 2013 (11.08) + Updated for Visual Studio 2013 and Windows 8.1 SDK RTM + +July 16, 2013 (11.07) + Added VS 2013 Preview project files + Cleaned up project files + Fixed a number of /analyze issues + +June 13, 2013 (11.06) + Added GetMatrixPointerArray, GetMatrixTransposePointerArray, SetMatrixPointerArray, SetMatrixTransposePointerArray methods + Reverted back to BOOL in some cases because sizeof(bool)==1, sizeof(BOOL)==4 + Some code-cleanup: minor SAL fix, removed bad assert, and added use of override keyword + +February 22, 2013 (11.05) + Cleaned up some warning level 4 warnings + +November 6, 2012 (11.04) + Added IUnknown as a base class for all Effects 11 interfaces to simplify use in managed interop sceanrios, although the + lifetime for these objects is still based on the lifetime of the parent ID3DX11Effect object. Therefore reference counting + is ignored for these interfaces. + ID3DX11EffectType, ID3DX11EffectVariable and derived classes, ID3DX11EffectPass, + ID3DX11EffectTechnique, and ID3DX11EffectGroup + +October 24, 2012 (11.03) + Removed the dependency on the D3DX11 headers, so FX11 no longer requires the legacy DirectX SDK to build. + It does require the d3dcompiler.h header from either the Windows 8.0 SDK or from the legacy DirectX SDK + Removed references to D3D10 constants and interfaces + Deleted the d3dx11dbg.cpp and d3dx11dbg.h files + Deleted the D3DX11_EFFECT_PASS flags which were never implemented + General C++ code cleanups (nullptr, C++ style casting, stdint.h types, Safer CRT, etc.) which are compatible with Visual C++ 2010 and 2012 + SAL2 annotation and /analyze cleanup + Added population of Direct3D debug names for object naming support in PIX and the SDK debug layer + Added additional optional parameter to D3DX11CreateEffectFromMemory to provide a debug name + Added D3DX11CreateEffectFromFile, D3DX11CompileEffectFromMemory, and D3DX11CompileEffectFromFile + +June 2010 (11.02) + The DirectX SDK (June 2010) included an update with some minor additional bug fixes. This also included the Effects 11-based + sample DynamicShaderLinkageFX11. This is the last version to support Visual Studio 2008. The source code is located in + Samples\C++\Effects11. + +February 2010 (11.01) + An update was shipped with the DirectX SDK (February 2010). This fixed a problem with the library which prevented it from + working correctly on 9.x and 10.x feature levels. This is the last version to support Visual Studio 2005. The source code + is located in Samples\C++\Effects11. + +August 2009 (11.00) + The initial release of Effects 11 (FX11) was in the DirectX SDK (August 2009). The source code is located in + Utilities\Source\Effects11. This is essentially the Effects 10 (FX10) system ported to Direct3D 11.0 with + support for effects pools removed and support for groups added. diff --git a/lib/win32/Effects11/d3dxGlobal.cpp b/lib/win32/Effects11/d3dxGlobal.cpp index 06cdcf92ed..af786c81b4 100644 --- a/lib/win32/Effects11/d3dxGlobal.cpp +++ b/lib/win32/Effects11/d3dxGlobal.cpp @@ -15,11 +15,7 @@ #include "pchfx.h" -// VS 2010's stdint.h conflicts with intsafe.h -#pragma warning(push) -#pragma warning(disable : 4005) #include <intsafe.h> -#pragma warning(pop) #include <stdio.h> #include <stdarg.h> diff --git a/lib/win32/Effects11/inc/d3dx11effect.h b/lib/win32/Effects11/inc/d3dx11effect.h index 62f1a335d9..f9adcea3d6 100644 --- a/lib/win32/Effects11/inc/d3dx11effect.h +++ b/lib/win32/Effects11/inc/d3dx11effect.h @@ -15,52 +15,21 @@ #pragma once -#define D3DX11_EFFECTS_VERSION 1111 +#define D3DX11_EFFECTS_VERSION 1117 #if defined(_XBOX_ONE) && defined(_TITLE) #include <d3d11_x.h> #define DCOMMON_H_INCLUDED #define NO_D3D11_DEBUG_NAME -#elif (_WIN32_WINNT >= 0x0602) || defined(_WIN7_PLATFORM_UPDATE) -#include <d3d11_1.h> -#include <d3d11shader.h> #else -#include <d3d11.h> +#include <d3d11_1.h> #include <d3d11shader.h> #endif #pragma comment( lib, "d3dcompiler.lib" ) #pragma comment( lib, "dxguid.lib" ) -// VS 2010's stdint.h conflicts with intsafe.h -#pragma warning(push) -#pragma warning(disable : 4005) #include <stdint.h> -#pragma warning(pop) - -#if defined(_MSC_VER) && (_MSC_VER<1610) && !defined(_In_reads_) -#define _Analysis_assume_(exp) __analysis_assume(exp) -#define _In_reads_(exp) _In_count_x_(exp) -#define _In_reads_opt_(exp) _In_opt_count_x_(exp) -#define _In_reads_bytes_(exp) _In_bytecount_x_(exp) -#define _Inout_updates_(exp) _Inout_cap_x_(exp) -#define _Inout_updates_z_(exp) _Inout_z_cap_x_(exp) -#define _Inout_updates_bytes_(exp) _Inout_bytecap_x_(exp) -#define _Out_writes_(exp) _Out_cap_x_(exp) -#define _Out_writes_bytes_(exp) _Out_bytecap_x_(exp) -#define _Outptr_ _Deref_out_ -#define _Outptr_result_z_ _Deref_out_z_ -#define _Outptr_opt_result_maybenull_ _Deref_opt_out_opt_ -#define _Outptr_result_maybenull_z_ _Deref_opt_out_opt_z_ -#define _Outptr_result_buffer_(exp) _Deref_post_cap_x_(exp) -#define _Outptr_result_buffer_all_maybenull_(exp) _Deref_post_opt_cap_x_(exp) -#define _COM_Outptr_ _Deref_out_ -#define _When_(test,exp) -#endif - -#ifndef _Use_decl_annotations_ -#define _Use_decl_annotations_ -#endif ////////////////////////////////////////////////////////////////////////////// // File contents: diff --git a/lib/win32/Effects11/inc/d3dxGlobal.h b/lib/win32/Effects11/inc/d3dxGlobal.h index 910e1d4b4c..bdd738c311 100644 --- a/lib/win32/Effects11/inc/d3dxGlobal.h +++ b/lib/win32/Effects11/inc/d3dxGlobal.h @@ -54,7 +54,7 @@ using namespace D3DX11Debug; #if FXDEBUG #define __BREAK_ON_FAIL { __debugbreak(); } #else -#define __BREAK_ON_FAIL +#define __BREAK_ON_FAIL #endif #define VA(x, action) { hr = (x); if (FAILED(hr)) { action; __BREAK_ON_FAIL; return hr; } } @@ -138,6 +138,7 @@ _declspec(selectany) unsigned int g_TimerRolloverCount = 0x80000000; #endif // _DEBUG && !_M_X64 + ////////////////////////////////////////////////////////////////////////// // CEffectVector - A vector implementation ////////////////////////////////////////////////////////////////////////// @@ -227,7 +228,7 @@ public: HRESULT hr = S_OK; Clear(); VN( m_pData = new uint8_t[vOther.m_MaxSize * sizeof(T)] ); - + m_CurSize = vOther.m_CurSize; m_MaxSize = vOther.m_MaxSize; m_hLastError = vOther.m_hLastError; @@ -270,10 +271,10 @@ lExit: void Empty() { - + // manually invoke destructor on all elements for (size_t i = 0; i < m_CurSize; ++ i) - { + { ((T*)m_pData + i)->~T(); } m_CurSize = 0; @@ -340,7 +341,7 @@ lExit: HRESULT Insert(_In_ const T& var, _In_ uint32_t index) { assert(index < m_CurSize); - + if (FAILED(Grow())) return m_hLastError; @@ -354,7 +355,7 @@ lExit: HRESULT InsertRange(_In_reads_(count) const T *pVar, _In_ uint32_t index, _In_ uint32_t count) { assert(index < m_CurSize); - + if (m_CurSize + count < m_CurSize) { m_hLastError = E_OUTOFMEMORY; @@ -408,7 +409,7 @@ lExit: uint32_t FindIndexOf(_In_ const void *pEntry) const { for (size_t i = 0; i < m_CurSize; ++ i) - { + { if (((T*)m_pData + i) == pEntry) return i; } @@ -554,6 +555,7 @@ public: typedef CheckedNumber<uint32_t, _UI32_MAX> CCheckedDword; typedef CheckedNumber<uint64_t, _UI64_MAX> CCheckedDword64; + ////////////////////////////////////////////////////////////////////////// // Data Block Store - A linked list of allocations ////////////////////////////////////////////////////////////////////////// @@ -573,6 +575,7 @@ public: HRESULT AddData(_In_reads_bytes_(bufferSize) const void *pNewData, _In_ uint32_t bufferSize, _Outptr_ CDataBlock **ppBlock); // Allocate reserves bufferSize bytes of contiguous memory and returns a pointer to the user + _Success_(return != nullptr) void* Allocate(_In_ uint32_t bufferSize, _Outptr_ CDataBlock **ppBlock); void EnableAlignment(); @@ -583,6 +586,7 @@ public: friend class CDataBlockStore; }; + class CDataBlockStore { protected: @@ -631,6 +635,7 @@ inline void __cdecl operator delete(_In_opt_ void* p, _In_ CDataBlockStore &pAll UNREFERENCED_PARAMETER(pAllocator); } + ////////////////////////////////////////////////////////////////////////// // Hash table ////////////////////////////////////////////////////////////////////////// @@ -667,7 +672,7 @@ static uint32_t ComputeHash(_In_reads_bytes_(cbToHash) const uint8_t *pb, _In_ u c += pdw[2]; HASH_MIX(a,b,c); - pb += 12; + pb += 12; cbLeft -= 12; } @@ -716,7 +721,7 @@ static uint32_t ComputeHashLower(_In_reads_bytes_(cbToHash) const uint8_t *pb, _ c += pdw[2]; HASH_MIX(a,b,c); - pb += 12; + pb += 12; cbLeft -= 12; } @@ -752,12 +757,13 @@ static uint32_t ComputeHash(_In_z_ LPCSTR pString) return ComputeHash(reinterpret_cast<const uint8_t*>(pString), (uint32_t)strlen(pString)); } + // 1) these numbers are prime // 2) each is slightly less than double the last // 4) each is roughly in between two powers of 2; // (2^n hash table sizes are VERY BAD; they effectively truncate your // precision down to the n least significant bits of the hash) -static const uint32_t c_PrimeSizes[] = +static const uint32_t c_PrimeSizes[] = { 11, 23, @@ -866,7 +872,7 @@ public: // seize this hash entry, migrate it to the new table SHashEntry *pNewEntry; VN( pNewEntry = new SHashEntry ); - + pNewEntry->pNext = rgpNewHashEntries[index]; pNewEntry->Data = iter.pHashEntry->Data; pNewEntry->Hash = iter.pHashEntry->Hash; @@ -937,7 +943,7 @@ public: return DesiredSize; } - + // O(n) function // Grows to the next suitable size (based off of the prime number table) // DesiredSize is merely a suggestion @@ -963,10 +969,10 @@ public: else { OwnProvidedArray = true; - + VN( rgpNewHashEntries = new SHashEntry*[actualSize] ); } - + ZeroMemory(rgpNewHashEntries, sizeof(SHashEntry*) * actualSize); // Expensive operation: rebuild the hash table @@ -1020,7 +1026,7 @@ lExit: DPF(0, "Uninitialized hash table!"); return; } - + float variance = 0.0f; float mean = (float)m_NumEntries / (float)m_NumHashSlots; uint32_t unusedSlots = 0; @@ -1035,7 +1041,7 @@ lExit: while (nullptr != pCurrentEntry) { SHashEntry *pCurrentEntry2 = m_rgpHashEntries[i]; - + // check other hash entries in this slot for hash collisions or duplications while (pCurrentEntry2 != pCurrentEntry) { @@ -1062,7 +1068,7 @@ lExit: { ++ unusedSlots; } - + // mean must be greater than 0 at this point variance += (float)entries * (float)entries / mean; } |