Commit 89222063 authored by Chuck Walbourn's avatar Chuck Walbourn
Browse files

Updated for VS 2017 (15.3)

parent 84694550

Kits/DirectXTK/DirectXTK_Windows10.vcxproj

+6 −6
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -601,7 +601,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -619,7 +619,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -637,7 +637,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -655,7 +655,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -673,7 +673,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>

Kits/DirectXTK/Src/pch.h

+2 −1
Original line number Diff line number Diff line
@@ -14,12 +14,13 @@ 
#pragma once



// VS 2013 related Off by default warnings

#pragma warning(disable : 4619 4616 4350 4351 4472 4640)

#pragma warning(disable : 4619 4616 4350 4351 4472 4640 5038)

// C4619/4616 #pragma warning warnings

// C4350 behavior change

// C4351 behavior change; warning removed in later versions

// C4472 'X' is a native enum: add an access specifier (private/public) to declare a WinRT enum

// C4640 construction of local static object is not thread-safe

// C5038 can't use strictly correct initialization order due to Dev12 initialization limitations



// Off by default warnings

#pragma warning(disable : 4061 4265 4365 4571 4623 4625 4626 4668 4710 4711 4746 4774 4820 4987 5026 5027 5031 5032)

Kits/DirectXTK12/DirectXTK_Windows10.vcxproj

+6 −6
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -545,7 +545,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -563,7 +563,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -581,7 +581,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -599,7 +599,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -617,7 +617,7 @@ 
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <WarningLevel>EnableAllWarnings</WarningLevel>

      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <AdditionalOptions>/permissive- %(AdditionalOptions)</AdditionalOptions>

      <AdditionalOptions>/permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>

Kits/DirectXTK12/Inc/ResourceUploadBatch.h

+4 −0
Original line number Diff line number Diff line
@@ -19,7 +19,11 @@ 
#include <d3d12.h>

#endif



#pragma warning(push)

#pragma warning(disable : 4619 5038)

#include <future>

#pragma warning(pop)



#include <memory>

Kits/DirectXTK12/Src/SpriteBatch.cpp

+3 −3
Original line number Diff line number Diff line
@@ -415,10 +415,10 @@ SpriteBatch::Impl::Impl(ID3D12Device* device, ResourceUploadBatch& upload, const 
    mSortMode(SpriteSortMode_Deferred),

    mSampler{},

    mTransformMatrix(MatrixIdentity),

    mDeviceResources(deviceResourcesPool.DemandCreate(device, upload)),

    mVertexPageSize(sizeof(VertexPositionColorTexture) * MaxBatchSize * VerticesPerSprite),

    mVertexSegment{},

    mSpriteCount(0)

    mVertexPageSize(sizeof(VertexPositionColorTexture) * MaxBatchSize * VerticesPerSprite),

    mSpriteCount(0),

    mDeviceResources(deviceResourcesPool.DemandCreate(device, upload))

{

    if (viewport != nullptr)

    {