Skip to content

Commit 211621d

Browse files
walbournwalbourn
committed
DirectXTK/DirectXTK12: September 15, 2016 release
1 parent 755b9b3 commit 211621d

File tree

147 files changed

+1160
-1302
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+1160
-1302
lines changed

‎Kits/DirectXTK/Readme.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ DirectXTK - the DirectX Tool Kit for DirectX 11
44

55
Copyright (c) Microsoft Corporation. All rights reserved.
66

7-
September 1, 2016
7+
September 15, 2016
88

99
This package contains the "DirectX Tool Kit", a collection of helper classes for
1010
writing Direct3D 11 C++ code for Universal Windows Platform (UWP) apps for Windows 10,
@@ -79,6 +79,10 @@ https://opensource.microsoft.com/codeofconduct/
7979
RELEASE HISTORY
8080
---------------
8181

82+
September 15, 2016
83+
Minor code cleanup
84+
xwbtool: added wildcard support for input filename and optional -r switch for recursive search
85+
8286
September 1, 2016
8387
Added forceSRGB optional parameter to SpriteFont ctor
8488
EffectFactory method EnableForceSRGB added

‎Kits/DirectXTK/Src/ScreenGrab.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ namespace
4343
//--------------------------------------------------------------------------------------
4444
HRESULT CaptureTexture(_In_ ID3D11DeviceContext* pContext,
4545
_In_ ID3D11Resource* pSource,
46-
_Inout_ D3D11_TEXTURE2D_DESC& desc,
47-
_Inout_ ComPtr<ID3D11Texture2D>& pStaging)
46+
D3D11_TEXTURE2D_DESC& desc,
47+
ComPtr<ID3D11Texture2D>& pStaging)
4848
{
4949
if (!pContext || !pSource)
5050
return E_INVALIDARG;
@@ -104,7 +104,7 @@ namespace
104104
desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
105105
desc.Usage = D3D11_USAGE_STAGING;
106106

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

@@ -125,7 +125,7 @@ namespace
125125
desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
126126
desc.Usage = D3D11_USAGE_STAGING;
127127

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

‎Kits/DirectXTK12/Readme.txt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ DirectXTK - the DirectX Tool Kit for DirectX 12
44

55
Copyright (c) Microsoft Corporation. All rights reserved.
66

7-
September 1, 2016
7+
September 15, 2016
88

99
This package contains the "DirectX Tool Kit", a collection of helper classes for
1010
writing Direct3D 12 C++ code for Universal Windows Platform (UWP) apps, Win32 desktop
@@ -95,6 +95,10 @@ COMPARISONS TO DIRECTX 11 VERSION
9595
RELEASE HISTORY
9696
---------------
9797

98+
September 15, 2016
99+
Rebuild shaders using 1.0 Root Signature for improved compatibility
100+
Minor code cleanup
101+
98102
September 1, 2016
99103
EffectPipelineStateDescription is now in it's own header
100104
Additional debug object naming

‎Kits/DirectXTK12/Src/ScreenGrab.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ namespace
163163
&bufferDesc,
164164
D3D12_RESOURCE_STATE_COPY_DEST,
165165
nullptr,
166-
IID_GRAPHICS_PPV_ARGS(pStaging.GetAddressOf()));
166+
IID_GRAPHICS_PPV_ARGS(pStaging.ReleaseAndGetAddressOf()));
167167
if (FAILED(hr))
168168
return hr;
169169

‎Kits/DirectXTK12/Src/Shaders/CompileShaders.cmd‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,25 +126,26 @@ endlocal
126126
exit /b
127127

128128
:CompileShader
129-
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
129+
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
130130
echo.
131131
echo %fxc%
132132
%fxc% || set error=1
133133
exit /b
134134

135135
:CompileShaderHLSL
136-
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
136+
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
137137
echo.
138138
echo %fxc%
139139
%fxc% || set error=1
140140
exit /b
141141

142142
:CompileComputeShader
143-
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
143+
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
144144
echo.
145145
echo %fxc%
146146
%fxc% || set error=1
147147
exit /b
148+
148149
:CompileShaderxbox
149150
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
150151
echo.

‎Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNe.inc‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ ret
4444

4545
const BYTE AlphaTestEffect_PSAlphaTestEqNe[] =
4646
{
47-
68, 88, 66, 67, 212, 59,
48-
52, 217, 27, 29, 159, 142,
49-
195, 106, 213, 24, 49, 112,
50-
128, 51, 1, 0, 0, 0,
51-
40, 3, 0, 0, 4, 0,
47+
68, 88, 66, 67, 6, 187,
48+
155, 103, 19, 100, 127, 9,
49+
38, 170, 122, 15, 11, 186,
50+
227, 242, 1, 0, 0, 0,
51+
28, 3, 0, 0, 4, 0,
5252
0, 0, 48, 0, 0, 0,
5353
152, 0, 0, 0, 204, 0,
5454
0, 0, 152, 2, 0, 0,
@@ -155,28 +155,26 @@ const BYTE AlphaTestEffect_PSAlphaTestEqNe[] =
155155
0, 0, 0, 0, 58, 0,
156156
16, 0, 0, 0, 0, 0,
157157
62, 0, 0, 1, 82, 84,
158-
83, 48, 136, 0, 0, 0,
159-
2, 0, 0, 0, 3, 0,
158+
83, 48, 124, 0, 0, 0,
159+
1, 0, 0, 0, 3, 0,
160160
0, 0, 24, 0, 0, 0,
161-
0, 0, 0, 0, 136, 0,
161+
0, 0, 0, 0, 124, 0,
162162
0, 0, 29, 0, 0, 0,
163163
2, 0, 0, 0, 0, 0,
164164
0, 0, 60, 0, 0, 0,
165165
0, 0, 0, 0, 0, 0,
166-
0, 0, 72, 0, 0, 0,
166+
0, 0, 68, 0, 0, 0,
167167
0, 0, 0, 0, 0, 0,
168-
0, 0, 104, 0, 0, 0,
168+
0, 0, 96, 0, 0, 0,
169169
0, 0, 0, 0, 0, 0,
170-
0, 0, 0, 0, 0, 0,
171-
1, 0, 0, 0, 80, 0,
172-
0, 0, 0, 0, 0, 0,
173-
1, 0, 0, 0, 0, 0,
174-
0, 0, 0, 0, 0, 0,
175-
0, 0, 0, 0, 255, 255,
176-
255, 255, 1, 0, 0, 0,
177-
112, 0, 0, 0, 3, 0,
170+
0, 0, 1, 0, 0, 0,
171+
76, 0, 0, 0, 0, 0,
178172
0, 0, 1, 0, 0, 0,
179173
0, 0, 0, 0, 0, 0,
174+
0, 0, 255, 255, 255, 255,
175+
1, 0, 0, 0, 104, 0,
176+
0, 0, 3, 0, 0, 0,
177+
1, 0, 0, 0, 0, 0,
180178
0, 0, 0, 0, 0, 0,
181179
255, 255, 255, 255
182180
};

‎Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNe.pdb‎

41.5 KB
Binary file not shown.

‎Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNeNoFog.inc‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ ret
4040

4141
const BYTE AlphaTestEffect_PSAlphaTestEqNeNoFog[] =
4242
{
43-
68, 88, 66, 67, 209, 120,
44-
42, 214, 233, 183, 20, 230,
45-
4, 47, 255, 110, 231, 195,
46-
67, 201, 1, 0, 0, 0,
47-
180, 2, 0, 0, 4, 0,
43+
68, 88, 66, 67, 255, 175,
44+
18, 200, 111, 81, 68, 35,
45+
208, 109, 127, 114, 236, 68,
46+
5, 212, 1, 0, 0, 0,
47+
168, 2, 0, 0, 4, 0,
4848
0, 0, 48, 0, 0, 0,
4949
128, 0, 0, 0, 180, 0,
5050
0, 0, 36, 2, 0, 0,
@@ -132,28 +132,26 @@ const BYTE AlphaTestEffect_PSAlphaTestEqNeNoFog[] =
132132
4, 3, 10, 0, 16, 0,
133133
0, 0, 0, 0, 62, 0,
134134
0, 1, 82, 84, 83, 48,
135-
136, 0, 0, 0, 2, 0,
135+
124, 0, 0, 0, 1, 0,
136136
0, 0, 3, 0, 0, 0,
137137
24, 0, 0, 0, 0, 0,
138-
0, 0, 136, 0, 0, 0,
138+
0, 0, 124, 0, 0, 0,
139139
29, 0, 0, 0, 2, 0,
140140
0, 0, 0, 0, 0, 0,
141141
60, 0, 0, 0, 0, 0,
142142
0, 0, 0, 0, 0, 0,
143-
72, 0, 0, 0, 0, 0,
143+
68, 0, 0, 0, 0, 0,
144144
0, 0, 0, 0, 0, 0,
145-
104, 0, 0, 0, 0, 0,
146-
0, 0, 0, 0, 0, 0,
147-
0, 0, 0, 0, 1, 0,
148-
0, 0, 80, 0, 0, 0,
149-
0, 0, 0, 0, 1, 0,
145+
96, 0, 0, 0, 0, 0,
150146
0, 0, 0, 0, 0, 0,
147+
1, 0, 0, 0, 76, 0,
151148
0, 0, 0, 0, 0, 0,
152-
0, 0, 255, 255, 255, 255,
153-
1, 0, 0, 0, 112, 0,
154-
0, 0, 3, 0, 0, 0,
155149
1, 0, 0, 0, 0, 0,
156150
0, 0, 0, 0, 0, 0,
151+
255, 255, 255, 255, 1, 0,
152+
0, 0, 104, 0, 0, 0,
153+
3, 0, 0, 0, 1, 0,
154+
0, 0, 0, 0, 0, 0,
157155
0, 0, 0, 0, 255, 255,
158156
255, 255
159157
};

‎Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestEqNeNoFog.pdb‎

39.5 KB
Binary file not shown.

‎Kits/DirectXTK12/Src/Shaders/Compiled/AlphaTestEffect_PSAlphaTestLtGt.inc‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ ret
4343

4444
const BYTE AlphaTestEffect_PSAlphaTestLtGt[] =
4545
{
46-
68, 88, 66, 67, 201, 70,
47-
74, 232, 25, 46, 112, 203,
48-
133, 5, 185, 149, 32, 234,
49-
180, 196, 1, 0, 0, 0,
50-
248, 2, 0, 0, 4, 0,
46+
68, 88, 66, 67, 129, 93,
47+
197, 65, 211, 237, 60, 40,
48+
53, 119, 230, 79, 6, 240,
49+
60, 239, 1, 0, 0, 0,
50+
236, 2, 0, 0, 4, 0,
5151
0, 0, 48, 0, 0, 0,
5252
152, 0, 0, 0, 204, 0,
5353
0, 0, 104, 2, 0, 0,
@@ -146,28 +146,26 @@ const BYTE AlphaTestEffect_PSAlphaTestLtGt[] =
146146
0, 0, 0, 0, 58, 0,
147147
16, 0, 0, 0, 0, 0,
148148
62, 0, 0, 1, 82, 84,
149-
83, 48, 136, 0, 0, 0,
150-
2, 0, 0, 0, 3, 0,
149+
83, 48, 124, 0, 0, 0,
150+
1, 0, 0, 0, 3, 0,
151151
0, 0, 24, 0, 0, 0,
152-
0, 0, 0, 0, 136, 0,
152+
0, 0, 0, 0, 124, 0,
153153
0, 0, 29, 0, 0, 0,
154154
2, 0, 0, 0, 0, 0,
155155
0, 0, 60, 0, 0, 0,
156156
0, 0, 0, 0, 0, 0,
157-
0, 0, 72, 0, 0, 0,
157+
0, 0, 68, 0, 0, 0,
158158
0, 0, 0, 0, 0, 0,
159-
0, 0, 104, 0, 0, 0,
159+
0, 0, 96, 0, 0, 0,
160160
0, 0, 0, 0, 0, 0,
161-
0, 0, 0, 0, 0, 0,
162-
1, 0, 0, 0, 80, 0,
163-
0, 0, 0, 0, 0, 0,
164-
1, 0, 0, 0, 0, 0,
165-
0, 0, 0, 0, 0, 0,
166-
0, 0, 0, 0, 255, 255,
167-
255, 255, 1, 0, 0, 0,
168-
112, 0, 0, 0, 3, 0,
161+
0, 0, 1, 0, 0, 0,
162+
76, 0, 0, 0, 0, 0,
169163
0, 0, 1, 0, 0, 0,
170164
0, 0, 0, 0, 0, 0,
165+
0, 0, 255, 255, 255, 255,
166+
1, 0, 0, 0, 104, 0,
167+
0, 0, 3, 0, 0, 0,
168+
1, 0, 0, 0, 0, 0,
171169
0, 0, 0, 0, 0, 0,
172170
255, 255, 255, 255
173171
};

0 commit comments

Comments
 (0)