Don't name a resource before checking if it created successfully

baldurk · baldurk · commit ba67c3214bd6 · 2017-08-02T21:04:22.000+01:00
diff --git a/renderdoc/driver/d3d12/d3d12_debug.cpp b/renderdoc/driver/d3d12/d3d12_debug.cpp
@@ -2661,14 +2661,14 @@ uint32_t D3D12DebugManager::PickVertex(uint32_t eventID, const MeshDisplay &cfg,
                                                     D3D12_RESOURCE_STATE_GENERIC_READ, NULL,
                                                     __uuidof(ID3D12Resource), (void **)&m_PickVB);
 
-      m_PickVB->SetName(L"m_PickVB");
-
       if(FAILED(hr))
       {
         RDCERR("Couldn't create pick vertex buffer: %08x", hr);
         return ~0U;
       }
 
+      m_PickVB->SetName(L"m_PickVB");
+
       sdesc.Buffer.NumElements = cfg.position.numVerts;
       m_WrappedDevice->CreateShaderResourceView(m_PickVB, &sdesc, GetCPUHandle(PICK_VB_SRV));
     }

Original file line number	Diff line number	Diff line change
`@@ -2661,14 +2661,14 @@ uint32_t D3D12DebugManager::PickVertex(uint32_t eventID, const MeshDisplay &cfg,`
`2661`	`2661`	`D3D12_RESOURCE_STATE_GENERIC_READ, NULL,`
`2662`	`2662`	`__uuidof(ID3D12Resource), (void **)&m_PickVB);`
`2663`	`2663`
`2664`		`- m_PickVB->SetName(L"m_PickVB");`
`2665`		`-`
`2666`	`2664`	`if(FAILED(hr))`
`2667`	`2665`	`{`
`2668`	`2666`	`RDCERR("Couldn't create pick vertex buffer: %08x", hr);`
`2669`	`2667`	`return ~0U;`
`2670`	`2668`	`}`
`2671`	`2669`
	`2670`	`+ m_PickVB->SetName(L"m_PickVB");`
	`2671`	`+`
`2672`	`2672`	`sdesc.Buffer.NumElements = cfg.position.numVerts;`
`2673`	`2673`	`m_WrappedDevice->CreateShaderResourceView(m_PickVB, &sdesc, GetCPUHandle(PICK_VB_SRV));`
`2674`	`2674`	`}`