Skip to content

Commit

Permalink
DirectXTK/DirectXTK12: September 15, 2016 release
Browse files Browse the repository at this point in the history
  • Loading branch information
@walbourn
walbourn committed Sep 16, 2016
1 parent 755b9b3 commit 211621d
Show file tree
Hide file tree
Showing 147 changed files with 1,160 additions and 1,302 deletions.
6 changes: 5 additions & 1 deletion Kits/DirectXTK/Readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ DirectXTK - the DirectX Tool Kit for DirectX 11

Copyright (c) Microsoft Corporation. All rights reserved.

September 1, 2016
September 15, 2016

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,
Expand Down Expand Up @@ -79,6 +79,10 @@ https://opensource.microsoft.com/codeofconduct/
RELEASE HISTORY
---------------

September 15, 2016
Minor code cleanup
xwbtool: added wildcard support for input filename and optional -r switch for recursive search

September 1, 2016
Added forceSRGB optional parameter to SpriteFont ctor
EffectFactory method EnableForceSRGB added
Expand Down
8 changes: 4 additions & 4 deletions Kits/DirectXTK/Src/ScreenGrab.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ namespace
//--------------------------------------------------------------------------------------
HRESULT CaptureTexture(_In_ ID3D11DeviceContext* pContext,
_In_ ID3D11Resource* pSource,
_Inout_ D3D11_TEXTURE2D_DESC& desc,
_Inout_ ComPtr<ID3D11Texture2D>& pStaging)
D3D11_TEXTURE2D_DESC& desc,
ComPtr<ID3D11Texture2D>& pStaging)
{
if (!pContext || !pSource)
return E_INVALIDARG;
Expand Down Expand Up @@ -104,7 +104,7 @@ namespace
desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
desc.Usage = D3D11_USAGE_STAGING;

hr = d3dDevice->CreateTexture2D(&desc, 0, pStaging.GetAddressOf());
hr = d3dDevice->CreateTexture2D(&desc, 0, pStaging.ReleaseAndGetAddressOf());
if (FAILED(hr))
return hr;

Expand All @@ -125,7 +125,7 @@ namespace
desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
desc.Usage = D3D11_USAGE_STAGING;

hr = d3dDevice->CreateTexture2D(&desc, 0, pStaging.GetAddressOf());
hr = d3dDevice->CreateTexture2D(&desc, 0, pStaging.ReleaseAndGetAddressOf());
if (FAILED(hr))
return hr;

Expand Down
6 changes: 5 additions & 1 deletion Kits/DirectXTK12/Readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ DirectXTK - the DirectX Tool Kit for DirectX 12

Copyright (c) Microsoft Corporation. All rights reserved.

September 1, 2016
September 15, 2016

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
Expand Down Expand Up @@ -95,6 +95,10 @@ COMPARISONS TO DIRECTX 11 VERSION
RELEASE HISTORY
---------------

September 15, 2016
Rebuild shaders using 1.0 Root Signature for improved compatibility
Minor code cleanup

September 1, 2016
EffectPipelineStateDescription is now in it's own header
Additional debug object naming
Expand Down
2 changes: 1 addition & 1 deletion Kits/DirectXTK12/Src/ScreenGrab.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ namespace
&bufferDesc,
D3D12_RESOURCE_STATE_COPY_DEST,
nullptr,
IID_GRAPHICS_PPV_ARGS(pStaging.GetAddressOf()));
IID_GRAPHICS_PPV_ARGS(pStaging.ReleaseAndGetAddressOf()));
if (FAILED(hr))
return hr;

Expand Down
7 changes: 4 additions & 3 deletions Kits/DirectXTK12/Src/Shaders/CompileShaders.cmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,25 +126,26 @@ endlocal
exit /b

:CompileShader
set fxc=fxc /nologo %1.fx /T%2_5_0 /Zi /Zpc /Qstrip_reflect /Qstrip_debug /E%3 /FhCompiled\%1_%3.inc /FdCompiled\%1_%3.pdb /Vn%1_%3
set fxc=fxc /nologo %1.fx /T%2_5_0 /Zi /Zpc /force_rootsig_ver rootsig_1_0 /Qstrip_reflect /Qstrip_debug /E%3 /FhCompiled\%1_%3.inc /FdCompiled\%1_%3.pdb /Vn%1_%3
echo.
echo %fxc%
%fxc% || set error=1
exit /b

:CompileShaderHLSL
set fxc=fxc /nologo %1.hlsl /T%2_5_0 /Zi /Zpc /Qstrip_reflect /Qstrip_debug /E%3 /FhCompiled\%1_%3.inc /FdCompiled\%1_%3.pdb /Vn%1_%3
set fxc=fxc /nologo %1.hlsl /T%2_5_0 /Zi /Zpc /force_rootsig_ver rootsig_1_0 /Qstrip_reflect /Qstrip_debug /E%3 /FhCompiled\%1_%3.inc /FdCompiled\%1_%3.pdb /Vn%1_%3
echo.
echo %fxc%
%fxc% || set error=1
exit /b

:CompileComputeShader
set fxc=fxc /nologo %1.hlsl /Tcs_5_0 /Zi /Zpc /Qstrip_reflect /Qstrip_debug /E%2 /FhCompiled\%1_%2.inc /FdCompiled\%1_%2.pdb /Vn%1_%2
set fxc=fxc /nologo %1.hlsl /Tcs_5_0 /Zi /Zpc /force_rootsig_ver rootsig_1_0 /Qstrip_reflect /Qstrip_debug /E%2 /FhCompiled\%1_%2.inc /FdCompiled\%1_%2.pdb /Vn%1_%2
echo.
echo %fxc%
%fxc% || set error=1
exit /b

:CompileShaderxbox
set fxc=%XBOXFXC% /nologo %1.fx /T%2_5_0 /Zi /Zpc /Qstrip_reflect /Qstrip_debug /D__XBOX_DISABLE_SHADER_NAME_EMPLACEMENT /E%3 /FhCompiled\XboxOne%1_%3.inc /FdCompiled\XboxOne%1_%3.pdb /Vn%1_%3
echo.
Expand Down
34 changes: 16 additions & 18 deletions Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNe.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ ret

const BYTE AlphaTestEffect_PSAlphaTestEqNe[] =
{
68, 88, 66, 67, 212, 59,
52, 217, 27, 29, 159, 142,
195, 106, 213, 24, 49, 112,
128, 51, 1, 0, 0, 0,
40, 3, 0, 0, 4, 0,
68, 88, 66, 67, 6, 187,
155, 103, 19, 100, 127, 9,
38, 170, 122, 15, 11, 186,
227, 242, 1, 0, 0, 0,
28, 3, 0, 0, 4, 0,
0, 0, 48, 0, 0, 0,
152, 0, 0, 0, 204, 0,
0, 0, 152, 2, 0, 0,
Expand Down Expand Up @@ -155,28 +155,26 @@ const BYTE AlphaTestEffect_PSAlphaTestEqNe[] =
0, 0, 0, 0, 58, 0,
16, 0, 0, 0, 0, 0,
62, 0, 0, 1, 82, 84,
83, 48, 136, 0, 0, 0,
2, 0, 0, 0, 3, 0,
83, 48, 124, 0, 0, 0,
1, 0, 0, 0, 3, 0,
0, 0, 24, 0, 0, 0,
0, 0, 0, 0, 136, 0,
0, 0, 0, 0, 124, 0,
0, 0, 29, 0, 0, 0,
2, 0, 0, 0, 0, 0,
0, 0, 60, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 72, 0, 0, 0,
0, 0, 68, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 104, 0, 0, 0,
0, 0, 96, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
1, 0, 0, 0, 80, 0,
0, 0, 0, 0, 0, 0,
1, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 255, 255,
255, 255, 1, 0, 0, 0,
112, 0, 0, 0, 3, 0,
0, 0, 1, 0, 0, 0,
76, 0, 0, 0, 0, 0,
0, 0, 1, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 255, 255, 255, 255,
1, 0, 0, 0, 104, 0,
0, 0, 3, 0, 0, 0,
1, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
255, 255, 255, 255
};
Binary file added Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNe.pdb
View file
Binary file not shown.
30 changes: 14 additions & 16 deletions Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNeNoFog.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ ret

const BYTE AlphaTestEffect_PSAlphaTestEqNeNoFog[] =
{
68, 88, 66, 67, 209, 120,
42, 214, 233, 183, 20, 230,
4, 47, 255, 110, 231, 195,
67, 201, 1, 0, 0, 0,
180, 2, 0, 0, 4, 0,
68, 88, 66, 67, 255, 175,
18, 200, 111, 81, 68, 35,
208, 109, 127, 114, 236, 68,
5, 212, 1, 0, 0, 0,
168, 2, 0, 0, 4, 0,
0, 0, 48, 0, 0, 0,
128, 0, 0, 0, 180, 0,
0, 0, 36, 2, 0, 0,
Expand Down Expand Up @@ -132,28 +132,26 @@ const BYTE AlphaTestEffect_PSAlphaTestEqNeNoFog[] =
4, 3, 10, 0, 16, 0,
0, 0, 0, 0, 62, 0,
0, 1, 82, 84, 83, 48,
136, 0, 0, 0, 2, 0,
124, 0, 0, 0, 1, 0,
0, 0, 3, 0, 0, 0,
24, 0, 0, 0, 0, 0,
0, 0, 136, 0, 0, 0,
0, 0, 124, 0, 0, 0,
29, 0, 0, 0, 2, 0,
0, 0, 0, 0, 0, 0,
60, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
72, 0, 0, 0, 0, 0,
68, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
104, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 1, 0,
0, 0, 80, 0, 0, 0,
0, 0, 0, 0, 1, 0,
96, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
1, 0, 0, 0, 76, 0,
0, 0, 0, 0, 0, 0,
0, 0, 255, 255, 255, 255,
1, 0, 0, 0, 112, 0,
0, 0, 3, 0, 0, 0,
1, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
255, 255, 255, 255, 1, 0,
0, 0, 104, 0, 0, 0,
3, 0, 0, 0, 1, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 255, 255,
255, 255
};
Binary file added Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNeNoFog.pdb
View file
Binary file not shown.
34 changes: 16 additions & 18 deletions Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGt.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ ret

const BYTE AlphaTestEffect_PSAlphaTestLtGt[] =
{
68, 88, 66, 67, 201, 70,
74, 232, 25, 46, 112, 203,
133, 5, 185, 149, 32, 234,
180, 196, 1, 0, 0, 0,
248, 2, 0, 0, 4, 0,
68, 88, 66, 67, 129, 93,
197, 65, 211, 237, 60, 40,
53, 119, 230, 79, 6, 240,
60, 239, 1, 0, 0, 0,
236, 2, 0, 0, 4, 0,
0, 0, 48, 0, 0, 0,
152, 0, 0, 0, 204, 0,
0, 0, 104, 2, 0, 0,
Expand Down Expand Up @@ -146,28 +146,26 @@ const BYTE AlphaTestEffect_PSAlphaTestLtGt[] =
0, 0, 0, 0, 58, 0,
16, 0, 0, 0, 0, 0,
62, 0, 0, 1, 82, 84,
83, 48, 136, 0, 0, 0,
2, 0, 0, 0, 3, 0,
83, 48, 124, 0, 0, 0,
1, 0, 0, 0, 3, 0,
0, 0, 24, 0, 0, 0,
0, 0, 0, 0, 136, 0,
0, 0, 0, 0, 124, 0,
0, 0, 29, 0, 0, 0,
2, 0, 0, 0, 0, 0,
0, 0, 60, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 72, 0, 0, 0,
0, 0, 68, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 104, 0, 0, 0,
0, 0, 96, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
1, 0, 0, 0, 80, 0,
0, 0, 0, 0, 0, 0,
1, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 255, 255,
255, 255, 1, 0, 0, 0,
112, 0, 0, 0, 3, 0,
0, 0, 1, 0, 0, 0,
76, 0, 0, 0, 0, 0,
0, 0, 1, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 255, 255, 255, 255,
1, 0, 0, 0, 104, 0,
0, 0, 3, 0, 0, 0,
1, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
255, 255, 255, 255
};
Binary file added Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGt.pdb
View file
Binary file not shown.
30 changes: 14 additions & 16 deletions Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGtNoFog.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ ret

const BYTE AlphaTestEffect_PSAlphaTestLtGtNoFog[] =
{
68, 88, 66, 67, 210, 138,
68, 229, 102, 18, 39, 236,
33, 105, 194, 45, 242, 212,
42, 206, 1, 0, 0, 0,
132, 2, 0, 0, 4, 0,
68, 88, 66, 67, 112, 205,
26, 2, 164, 202, 117, 150,
27, 52, 158, 167, 34, 64,
152, 185, 1, 0, 0, 0,
120, 2, 0, 0, 4, 0,
0, 0, 48, 0, 0, 0,
128, 0, 0, 0, 180, 0,
0, 0, 244, 1, 0, 0,
Expand Down Expand Up @@ -123,28 +123,26 @@ const BYTE AlphaTestEffect_PSAlphaTestLtGtNoFog[] =
4, 3, 10, 0, 16, 0,
0, 0, 0, 0, 62, 0,
0, 1, 82, 84, 83, 48,
136, 0, 0, 0, 2, 0,
124, 0, 0, 0, 1, 0,
0, 0, 3, 0, 0, 0,
24, 0, 0, 0, 0, 0,
0, 0, 136, 0, 0, 0,
0, 0, 124, 0, 0, 0,
29, 0, 0, 0, 2, 0,
0, 0, 0, 0, 0, 0,
60, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
72, 0, 0, 0, 0, 0,
68, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
104, 0, 0, 0, 0, 0,
96, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 1, 0,
0, 0, 80, 0, 0, 0,
0, 0, 0, 0, 1, 0,
1, 0, 0, 0, 76, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 255, 255, 255, 255,
1, 0, 0, 0, 112, 0,
0, 0, 3, 0, 0, 0,
1, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
255, 255, 255, 255, 1, 0,
0, 0, 104, 0, 0, 0,
3, 0, 0, 0, 1, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 255, 255,
255, 255
};
Binary file added Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGtNoFog.pdb
View file
Binary file not shown.
34 changes: 16 additions & 18 deletions Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTest.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ ret

const BYTE AlphaTestEffect_VSAlphaTest[] =
{
68, 88, 66, 67, 158, 30,
27, 129, 109, 217, 246, 178,
176, 238, 98, 197, 219, 198,
7, 89, 1, 0, 0, 0,
4, 3, 0, 0, 4, 0,
68, 88, 66, 67, 235, 107,
90, 17, 222, 218, 154, 184,
61, 35, 90, 170, 238, 229,
132, 184, 1, 0, 0, 0,
248, 2, 0, 0, 4, 0,
0, 0, 48, 0, 0, 0,
136, 0, 0, 0, 20, 1,
0, 0, 116, 2, 0, 0,
Expand Down Expand Up @@ -148,28 +148,26 @@ const BYTE AlphaTestEffect_VSAlphaTest[] =
70, 142, 32, 0, 0, 0,
0, 0, 7, 0, 0, 0,
62, 0, 0, 1, 82, 84,
83, 48, 136, 0, 0, 0,
2, 0, 0, 0, 3, 0,
83, 48, 124, 0, 0, 0,
1, 0, 0, 0, 3, 0,
0, 0, 24, 0, 0, 0,
0, 0, 0, 0, 136, 0,
0, 0, 0, 0, 124, 0,
0, 0, 29, 0, 0, 0,
2, 0, 0, 0, 0, 0,
0, 0, 60, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 72, 0, 0, 0,
0, 0, 68, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 104, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
1, 0, 0, 0, 80, 0,
0, 0, 0, 0, 0, 0,
1, 0, 0, 0, 0, 0,
0, 0, 96, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 255, 255,
255, 255, 1, 0, 0, 0,
112, 0, 0, 0, 3, 0,
0, 0, 1, 0, 0, 0,
76, 0, 0, 0, 0, 0,
0, 0, 1, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 255, 255, 255, 255,
1, 0, 0, 0, 104, 0,
0, 0, 3, 0, 0, 0,
1, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
255, 255, 255, 255
};
Binary file added Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_VSAlphaTest.pdb
View file
Binary file not shown.
Loading

0 comments on commit 211621d

Please sign in to comment.