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

Updated Kits for February 2018 releases

parent 9d9f25e2

Kits/DirectXTK/Readme.txt

+8 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ DirectXTK - the DirectX Tool Kit for DirectX 11 


Copyright (c) Microsoft Corporation. All rights reserved.



December 13, 2017

February 7, 2018



This package contains the "DirectX Tool Kit", a collection of helper classes for 

writing Direct3D 11 C++ code for Universal Windows Platform (UWP) apps for Windows 10,
@@ -14,8 +14,8 @@ Windows Vista Service Pack 2 Direct3D 11.0 applications. 


This code is designed to build with Visual Studio 2013 Update 5, Visual Studio 2015 Update 3,

or Visual Studio 2017. It is recommended that you make use of VS 2015 Update 3, Windows Tools

1.4.1, and the Windows 10 Anniversary Update SDK (14393) or VS 2017 with the Windows 10

Fall Creators Update SDK (16299).

1.4.1, and the Windows 10 Anniversary Update SDK (14393) or VS 2017 (15.5 update) with the

Windows 10 Fall Creators Update SDK (16299).



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>.
@@ -92,6 +92,11 @@ RELEASE NOTES 
RELEASE HISTORY

---------------



February 7, 2018

    Mouse fix for cursor behavior when using Remote Desktop for Win32

    Updated for a few more VS 2017 warnings

    Code cleanup



December 13, 2017

    PBREffect and DebugEffect added

    NormalMapEffect no longer requires or uses explicit vertex tangents

Kits/DirectXTK/Src/Mouse.cpp

+4 −1
Original line number Diff line number Diff line
@@ -268,11 +268,14 @@ void Mouse::ProcessMessage(UINT message, WPARAM wParam, LPARAM lParam) 
        POINT point;

        point.x = pImpl->mLastX;

        point.y = pImpl->mLastY;



        // We show the cursor before moving it to support Remote Desktop

        ShowCursor(TRUE);



        if (MapWindowPoints(pImpl->mWindow, nullptr, &point, 1))

        {

            SetCursorPos(point.x, point.y);

        }

        ShowCursor(TRUE);

        pImpl->mState.x = pImpl->mLastX;

        pImpl->mState.y = pImpl->mLastY;

    }

Kits/DirectXTK/Src/XboxDDSTextureLoader.cpp

+17 −12
Original line number Diff line number Diff line
@@ -34,6 +34,16 @@ using namespace Xbox; 


namespace

{

    //--------------------------------------------------------------------------------------

    // Default XMemAlloc attributes for texture loading

    //--------------------------------------------------------------------------------------

    const uint64_t c_XMemAllocAttributes = MAKE_XALLOC_ATTRIBUTES(

        eXALLOCAllocatorId_MiddlewareReservedMin,

        0,

        XALLOC_MEMTYPE_GRAPHICS_WRITECOMBINE_GPU_READONLY,

        XALLOC_PAGESIZE_64KB,

        XALLOC_ALIGNMENT_64K);



    //--------------------------------------------------------------------------------------

    // DDS file structure definitions

    //
@@ -85,7 +95,7 @@ namespace 
        }



        // Get the file size

        LARGE_INTEGER FileSize = { 0 };

        LARGE_INTEGER FileSize = {};



        FILE_STANDARD_INFO fileInfo;

        if (!GetFileInformationByHandleEx(hFile.get(), FileStandardInfo, &fileInfo, sizeof(fileInfo)))
@@ -555,15 +565,10 @@ namespace 
            return HRESULT_FROM_WIN32(ERROR_HANDLE_EOF);

        }



        // Allocate graphics memory

        size_t sizeBytes = (size_t(xboxext->dataSize) + 0xFFF) & ~0xFFF; // 4K boundary

        size_t alignmentBytes = std::max<size_t>(xboxext->baseAlignment, 4096);



        hr = D3DAllocateGraphicsMemory(sizeBytes, alignmentBytes, 0, D3D11_GRAPHICS_MEMORY_ACCESS_CPU_CACHE_COHERENT, grfxMemory);

        if (FAILED(hr))

            return hr;



        assert(*grfxMemory != 0);

        // Allocate graphics memory. Depending on the data size it uses 4MB or 64K pages.

        *grfxMemory = XMemAlloc(xboxext->dataSize, c_XMemAllocAttributes);

        if (!*grfxMemory)

            return E_OUTOFMEMORY;



        // Copy tiled data into graphics memory

        memcpy(*grfxMemory, bitData, xboxext->dataSize);
@@ -575,7 +580,7 @@ namespace 
            texture, textureView);

        if (FAILED(hr))

        {

            (void)D3DFreeGraphicsMemory(*grfxMemory);

            XMemFree(grfxMemory, c_XMemAllocAttributes);

            *grfxMemory = nullptr;

        }
@@ -782,6 +787,6 @@ void Xbox::FreeDDSTextureMemory(void* grfxMemory) 
{

    if (grfxMemory)

    {

        (void)D3DFreeGraphicsMemory(grfxMemory);

        XMemFree(grfxMemory, c_XMemAllocAttributes);

    }

}

Kits/DirectXTK/Src/pch.h

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
// 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 5039)

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

// C4061 enumerator 'X' in switch of enum 'X' is not explicitly handled by a case label

// C4265 class has virtual functions, but destructor is not virtual

// C4365 signed/unsigned mismatch
@@ -31,6 +31,7 @@ 
// C4623 default constructor was implicitly defined as deleted

// C4625 copy constructor was implicitly defined as deleted

// C4626 assignment operator was implicitly defined as deleted

// C4628 digraphs not supported

// C4668 not defined as a preprocessor macro

// C4710 function not inlined

// C4711 selected for automatic inline expansion

Kits/DirectXTK12/Readme.txt

+7 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ DirectXTK - the DirectX Tool Kit for DirectX 12 


Copyright (c) Microsoft Corporation. All rights reserved.



December 13, 2017

February 7, 2018



This package contains the "DirectX Tool Kit", a collection of helper classes for 

writing Direct3D 12 C++ code for Universal Windows Platform (UWP) apps, Win32 desktop
@@ -12,8 +12,8 @@ applications for Windows 10, and Xbox One exclusive apps. 


This code is designed to build with Visual Studio 2015 Update 3 or Visual Studio 2017.

It is recommended that you make use of VS 2015 Update 3, Windows Tools 1.4.1, and the

Windows 10 Anniversary Update SDK (14393) or VS 2017 with the Windows 10

Fall Creators Update SDK (16299).

Windows 10 Anniversary Update SDK (14393) or VS 2017 (15.5 update) with the

Windows 10 Fall Creators Update SDK (16299).



Inc\

    Public Header Files (in the DirectX C++ namespace):
@@ -108,6 +108,10 @@ RELEASE NOTES 
RELEASE HISTORY

---------------



February 7, 2018

    Mouse fix for cursor behavior when using Remote Desktop for Win32

    Updated for a few more VS 2017 warnings



December 13, 2017

    PBREffect and DebugEffect added

    NormalMapEffect no longer requires or uses explicit vertex tangents