Skip to content

Commit 00b0385

Browse files
Update CoopVecAPI.h with latest Agility SDK preview d3d12.h
1 parent e70a45f commit 00b0385

2 files changed

Lines changed: 15 additions & 17 deletions

File tree

tools/clang/unittests/HLSLExec/CoopVecAPI.h

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -145,26 +145,24 @@ ID3D12DevicePreview : public IUnknown
145145
#endif /* __ID3D12DevicePreview_INTERFACE_DEFINED__ */
146146

147147

148-
#ifndef __ID3D12GraphicsCommandList11_INTERFACE_DEFINED__
149-
#define __ID3D12GraphicsCommandList11_INTERFACE_DEFINED__
148+
#ifndef __ID3D12GraphicsCommandListPreview_INTERFACE_DEFINED__
149+
#define __ID3D12GraphicsCommandListPreview_INTERFACE_DEFINED__
150150

151-
EXTERN_C const IID IID_ID3D12GraphicsCommandList11;
151+
EXTERN_C const IID IID_ID3D12GraphicsCommandListPreview;
152152

153-
MIDL_INTERFACE("f0dcfabc-a84a-4fe3-b3b9-eab26b306c38")
154-
ID3D12GraphicsCommandList11 : public ID3D12GraphicsCommandList10
153+
MIDL_INTERFACE("536d9bb6-9eee-4c75-86e8-e29e29e08ed3")
154+
ID3D12GraphicsCommandListPreview : public ID3D12GraphicsCommandList10
155155
{
156156
public:
157157
virtual void STDMETHODCALLTYPE Reserved0() = 0;
158-
virtual void STDMETHODCALLTYPE Reserved1() = 0;
159-
virtual void STDMETHODCALLTYPE Reserved2() = 0;
160158

161159
virtual void STDMETHODCALLTYPE ConvertLinearAlgebraMatrix(
162160
_In_ const D3D12_LINEAR_ALGEBRA_MATRIX_CONVERSION_INFO *pDesc,
163161
_In_ UINT DescCount) = 0;
164162

165163
};
166164

167-
#endif /* __ID3D12GraphicsCommandList11_INTERFACE_DEFINED__ */
165+
#endif /* __ID3D12GraphicsCommandListPreview_INTERFACE_DEFINED__ */
168166

169167
#else // __ID3D12GraphicsCommandList10_INTERFACE_DEFINED__
170168
// The used d3d12.h header does not support ID3D12GraphicsCommandList10,

tools/clang/unittests/HLSLExec/ExecutionTest.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12745,10 +12745,10 @@ float4 ps_main() : SV_Target {
1274512745
InputMatrixSRVResources[I]->GetGPUVirtualAddress();
1274612746

1274712747
// Get command list interface and perform conversion
12748-
CComPtr<ID3D12GraphicsCommandList11> CommandList11;
12748+
CComPtr<ID3D12GraphicsCommandListPreview> CommandListPreview;
1274912749
VERIFY_SUCCEEDED(CommandList->QueryInterface(
12750-
__uuidof(ID3D12GraphicsCommandList11), (void **)&CommandList11));
12751-
CommandList11->ConvertLinearAlgebraMatrix(&ConvertInfo, 1);
12750+
__uuidof(ID3D12GraphicsCommandListPreview), (void **)&CommandListPreview));
12751+
CommandListPreview->ConvertLinearAlgebraMatrix(&ConvertInfo, 1);
1275212752

1275312753
// This increments BaseHandle
1275412754
CreateRawSRV(D3DDevice, BaseHandle, SRVSize / sizeof(int32_t),
@@ -13376,10 +13376,10 @@ float4 ps_main() : SV_Target {
1337613376
ConvertInfo.DataDesc = DataDesc;
1337713377

1337813378
// Get command list interface and perform conversion
13379-
CComPtr<ID3D12GraphicsCommandList11> CommandList11;
13379+
CComPtr<ID3D12GraphicsCommandListPreview> CommandListPreview;
1338013380
VERIFY_SUCCEEDED(CommandList->QueryInterface(
13381-
__uuidof(ID3D12GraphicsCommandList11), (void **)&CommandList11));
13382-
CommandList11->ConvertLinearAlgebraMatrix(&ConvertInfo, 1);
13381+
__uuidof(ID3D12GraphicsCommandListPreview), (void **)&CommandListPreview));
13382+
CommandListPreview->ConvertLinearAlgebraMatrix(&ConvertInfo, 1);
1338313383

1338413384
// This increments baseHandle
1338513385
if ((ConvertInfo.DestInfo.DestSize % 4) != 0) {
@@ -13527,10 +13527,10 @@ float4 ps_main() : SV_Target {
1352713527
ConvertedMatrixResource->GetGPUVirtualAddress();
1352813528

1352913529
// Get command list interface and perform conversion
13530-
CComPtr<ID3D12GraphicsCommandList11> CommandList11;
13530+
CComPtr<ID3D12GraphicsCommandListPreview> CommandListPreview;
1353113531
VERIFY_SUCCEEDED(CommandList->QueryInterface(
13532-
__uuidof(ID3D12GraphicsCommandList11), (void **)&CommandList11));
13533-
CommandList11->ConvertLinearAlgebraMatrix(&ConvertInfo, 1);
13532+
__uuidof(ID3D12GraphicsCommandListPreview), (void **)&CommandListPreview));
13533+
CommandListPreview->ConvertLinearAlgebraMatrix(&ConvertInfo, 1);
1353413534
}
1353513535

1353613536
RecordTransitionBarrier(CommandList, MatrixRowMajorResource,

0 commit comments

Comments
 (0)