Move the setting of root signatures to after SetDescriptorHeaps (#463)

Fixes #462

Author: Icohedron

lib/API/DX/Device.cpp

@@ -957,18 +957,17 @@ class DXDevice : public offloadtest::Device {
   }
 
   llvm::Error createComputeCommands(Pipeline &P, InvocationState &IS) {
-    IS.CmdList->SetPipelineState(IS.PSO.Get());
-    IS.CmdList->SetComputeRootSignature(IS.RootSig.Get());
-
-    const uint32_t Inc = Device->GetDescriptorHandleIncrementSize(
-        D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
     CD3DX12_GPU_DESCRIPTOR_HANDLE Handle;
-
     if (IS.DescHeap) {
       ID3D12DescriptorHeap *const Heaps[] = {IS.DescHeap.Get()};
       IS.CmdList->SetDescriptorHeaps(1, Heaps);
       Handle = IS.DescHeap->GetGPUDescriptorHandleForHeapStart();
     }
+    IS.CmdList->SetComputeRootSignature(IS.RootSig.Get());
+    IS.CmdList->SetPipelineState(IS.PSO.Get());
+
+    const uint32_t Inc = Device->GetDescriptorHandleIncrementSize(
+        D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV);
 
     if (P.Settings.DX.RootParams.size() > 0) {
       uint32_t ConstantOffset = 0u;
@@ -1315,8 +1314,14 @@ class DXDevice : public offloadtest::Device {
         IS.RTVHeap->GetCPUDescriptorHandleForHeapStart();
     Device->CreateRenderTargetView(IS.RT.Get(), nullptr, RTVHandle);
 
-    IS.CmdList->SetPipelineState(IS.PSO.Get());
+    if (IS.DescHeap) {
+      ID3D12DescriptorHeap *const Heaps[] = {IS.DescHeap.Get()};
+      IS.CmdList->SetDescriptorHeaps(1, Heaps);
+      IS.CmdList->SetGraphicsRootDescriptorTable(
+          0, IS.DescHeap->GetGPUDescriptorHandleForHeapStart());
+    }
     IS.CmdList->SetGraphicsRootSignature(IS.RootSig.Get());
+    IS.CmdList->SetPipelineState(IS.PSO.Get());
 
     IS.CmdList->OMSetRenderTargets(1, &RTVHandle, false, nullptr);
 
@@ -1334,13 +1339,6 @@ class DXDevice : public offloadtest::Device {
                                 static_cast<LONG>(VP.Height)};
     IS.CmdList->RSSetScissorRects(1, &Scissor);
 
-    if (IS.DescHeap) {
-      ID3D12DescriptorHeap *const Heaps[] = {IS.DescHeap.Get()};
-      IS.CmdList->SetDescriptorHeaps(1, Heaps);
-      IS.CmdList->SetGraphicsRootDescriptorTable(
-          0, IS.DescHeap->GetGPUDescriptorHandleForHeapStart());
-    }
-
     IS.CmdList->DrawInstanced(P.Bindings.getVertexCount(), 1, 0, 0);
 
     // Transition the render target to copy source and copy to the readback