Commit 85d41158 authored by Chuck Walbourn's avatar Chuck Walbourn
Browse files

Updated Directx Tool Kit and DirectXTex for August 2018 releases

parent cdb27fb4

Kits/ATGTK/d3dx12.h

+1 −1
Original line number Diff line number Diff line
@@ -2548,7 +2548,7 @@ inline HRESULT D3DX12ParsePipelineStream(const D3D12_PIPELINE_STATE_STREAM_DESC& 
    {

        BYTE* pStream = static_cast<BYTE*>(Desc.pPipelineStateSubobjectStream)+CurOffset;

        auto SubobjectType = *reinterpret_cast<D3D12_PIPELINE_STATE_SUBOBJECT_TYPE*>(pStream);

        if (SubobjectType >= D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_MAX_VALID)

        if (SubobjectType < 0 || SubobjectType >= D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_MAX_VALID)

        {

            pCallbacks->ErrorUnknownSubobject(SubobjectType);

            return E_INVALIDARG;

Kits/DirectXTK/DirectXTK_Desktop_2017.vcxproj

+6 −4
Original line number Diff line number Diff line
@@ -567,7 +567,8 @@ 
      <FloatingPointModel>Fast</FloatingPointModel>

      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <SDLCheck>true</SDLCheck>

      <ConformanceMode>true</ConformanceMode>

      <ConformanceMode>false</ConformanceMode>

      <SupportJustMyCode>false</SupportJustMyCode>

    </ClCompile>

    <Link>

      <SubSystem>Windows</SubSystem>
@@ -586,7 +587,8 @@ 
      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>

      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <SDLCheck>true</SDLCheck>

      <ConformanceMode>true</ConformanceMode>

      <ConformanceMode>false</ConformanceMode>

      <SupportJustMyCode>false</SupportJustMyCode>

    </ClCompile>

    <Link>

      <SubSystem>Windows</SubSystem>
@@ -604,7 +606,7 @@ 
      <FloatingPointModel>Fast</FloatingPointModel>

      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <SDLCheck>true</SDLCheck>

      <ConformanceMode>true</ConformanceMode>

      <ConformanceMode>false</ConformanceMode>

    </ClCompile>

    <Link>

      <SubSystem>Windows</SubSystem>
@@ -625,7 +627,7 @@ 
      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>

      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <SDLCheck>true</SDLCheck>

      <ConformanceMode>true</ConformanceMode>

      <ConformanceMode>false</ConformanceMode>

    </ClCompile>

    <Link>

      <SubSystem>Windows</SubSystem>

Kits/DirectXTK/DirectXTK_Windows10.vcxproj

+3 −0
Original line number Diff line number Diff line
@@ -633,6 +633,7 @@ 
      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <ConformanceMode>true</ConformanceMode>

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

      <SupportJustMyCode>false</SupportJustMyCode>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -674,6 +675,7 @@ 
      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <ConformanceMode>true</ConformanceMode>

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

      <SupportJustMyCode>false</SupportJustMyCode>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>
@@ -714,6 +716,7 @@ 
      <PreprocessorDefinitions>_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <ConformanceMode>true</ConformanceMode>

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

      <SupportJustMyCode>false</SupportJustMyCode>

    </ClCompile>

    <Link>

      <SubSystem>Console</SubSystem>

Kits/DirectXTK/DirectXTK_XboxOneXDK_2017.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -661,6 +661,7 @@ 
      <CompileAsWinRT>false</CompileAsWinRT>

      <AdditionalIncludeDirectories>$(ProjectDir)Inc;$(ProjectDir)Src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>

      <SupportJustMyCode>false</SupportJustMyCode>

    </ClCompile>

  </ItemDefinitionGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

Kits/DirectXTK/Inc/GamePad.h

+3 −0
Original line number Diff line number Diff line
@@ -169,6 +169,8 @@ namespace DirectX 
            Type            gamepadType;

        #if (_WIN32_WINNT >= 0x0A00 /*_WIN32_WINNT_WIN10*/)

            std::wstring    id;



            Capabilities() noexcept : connected(false), gamepadType(UNKNOWN) {}

        #else

            uint64_t        id;

        #endif
@@ -228,6 +230,7 @@ namespace DirectX 
            ButtonState leftTrigger;

            ButtonState rightTrigger;



            #pragma prefast(suppress: 26495, "Reset() performs the initialization")

            ButtonStateTracker() noexcept { Reset(); }



            void __cdecl Update(const State& state);