Merge remote-tracking branch 'ms/main' into ser_hlslaccessors_patch

Author: tex3d

azure-pipelines.yml

@@ -52,7 +52,7 @@ stages:
 
     variables:
       macOS: macOS-latest
-      linux: Ubuntu-latest
+      linux: Ubuntu-22.04 # FIXME: #7364, DXC does not build correctly with GCC 13+
 
     strategy:
       matrix:

tools/clang/unittests/HLSLExec/ShaderOpTest.cpp

@@ -258,6 +258,15 @@ void CommandListRefs::CreateForDevice(ID3D12Device *pDevice, bool compute) {
                                       IID_PPV_ARGS(&List)));
 }
 
+ShaderOpTest::ShaderOpTest() {
+  m_hFence = CreateEvent(nullptr, FALSE, FALSE, nullptr);
+  if (m_hFence == nullptr) {
+    AtlThrow(HRESULT_FROM_WIN32(GetLastError()));
+  }
+}
+
+ShaderOpTest::~ShaderOpTest() { CloseHandle(m_hFence); }
+
 void ShaderOpTest::CopyBackResources() {
   CommandListRefs ResCommandList;
   ResCommandList.CreateForDevice(m_pDevice, m_pShaderOp->IsCompute());
@@ -423,10 +432,6 @@ void ShaderOpTest::CreateDevice() {
   CHECK_HR(m_pDevice->CreateFence(0, D3D12_FENCE_FLAG_NONE,
                                   __uuidof(ID3D12Fence), (void **)&m_pFence));
   m_pFence->SetName(L"ShaderOpTest Fence");
-  m_hFence = CreateEvent(nullptr, FALSE, FALSE, nullptr);
-  if (m_hFence == nullptr) {
-    AtlThrow(HRESULT_FROM_WIN32(GetLastError()));
-  }
 }
 
 static void InitByteCode(D3D12_SHADER_BYTECODE *pBytecode, ID3D10Blob *pBlob) {

tools/clang/unittests/HLSLExec/ShaderOpTest.h

@@ -275,6 +275,9 @@ class ShaderOpTest {
   typedef std::function<void(LPCSTR Name, LPCSTR pText, IDxcBlob **ppShaderBlob,
                              ShaderOp *pShaderOp)>
       TShaderCallbackFn;
+
+  ShaderOpTest();
+  ~ShaderOpTest();
   void GetPipelineStats(D3D12_QUERY_DATA_PIPELINE_STATISTICS *pStats);
   void GetReadBackData(LPCSTR pResourceName, MappedData *pData);
   void RunShaderOp(ShaderOp *pShaderOp);