diff --git a/renderdoc/driver/d3d12/d3d12_commands.cpp b/renderdoc/driver/d3d12/d3d12_commands.cpp
index 5684b236a..7c9629e17 100644
--- a/renderdoc/driver/d3d12/d3d12_commands.cpp
+++ b/renderdoc/driver/d3d12/d3d12_commands.cpp
@@ -912,7 +912,7 @@ void D3D12CommandData::GetIndirectBuffer(size_t size, ID3D12Resource **buf, uint
     SetObjName(argbuf, StringFormat::Fmt("Indirect Arg Buf (%llu bytes)", (uint64_t)size));
 
     if(FAILED(hr))
-      RDCERR("Failed to create indirect buffer, HRESULT: 0x%08x", hr);
+      RDCERR("Failed to create indirect buffer, HRESULT: %s", ToStr(hr).c_str());
 
     m_IndirectBuffers.push_back(argbuf);
     m_IndirectOffset = 0;
diff --git a/renderdoc/driver/d3d12/d3d12_counters.cpp b/renderdoc/driver/d3d12/d3d12_counters.cpp
index 3d2e79adc..2321e507b 100644
--- a/renderdoc/driver/d3d12/d3d12_counters.cpp
+++ b/renderdoc/driver/d3d12/d3d12_counters.cpp
@@ -283,7 +283,7 @@ vector<CounterResult> D3D12Replay::FetchCounters(const vector<GPUCounter> &count
                                                   __uuidof(ID3D12Resource), (void **)&readbackBuf);
   if(FAILED(hr))
   {
-    RDCERR("Failed to create query readback buffer %08x", hr);
+    RDCERR("Failed to create query readback buffer HRESULT: %s", ToStr(hr).c_str());
     return ret;
   }
 
@@ -296,7 +296,7 @@ vector<CounterResult> D3D12Replay::FetchCounters(const vector<GPUCounter> &count
                                   (void **)&timerQueryHeap);
   if(FAILED(hr))
   {
-    RDCERR("Failed to create timer query heap %08x", hr);
+    RDCERR("Failed to create timer query heap HRESULT: %s", ToStr(hr).c_str());
     return ret;
   }
 
@@ -309,7 +309,7 @@ vector<CounterResult> D3D12Replay::FetchCounters(const vector<GPUCounter> &count
                                   (void **)&pipestatsQueryHeap);
   if(FAILED(hr))
   {
-    RDCERR("Failed to create pipeline statistics query heap %08x", hr);
+    RDCERR("Failed to create pipeline statistics query heap HRESULT: %s", ToStr(hr).c_str());
     return ret;
   }
 
@@ -322,7 +322,7 @@ vector<CounterResult> D3D12Replay::FetchCounters(const vector<GPUCounter> &count
                                   (void **)&occlusionQueryHeap);
   if(FAILED(hr))
   {
-    RDCERR("Failed to create occlusion query heap %08x", hr);
+    RDCERR("Failed to create occlusion query heap HRESULT: %s", ToStr(hr).c_str());
     return ret;
   }
 
@@ -377,7 +377,7 @@ vector<CounterResult> D3D12Replay::FetchCounters(const vector<GPUCounter> &count
   hr = readbackBuf->Map(0, &range, (void **)&data);
   if(FAILED(hr))
   {
-    RDCERR("Failed to read timer query heap data %08x", hr);
+    RDCERR("Failed to read timer query heap data HRESULT: %s", ToStr(hr).c_str());
     SAFE_RELEASE(readbackBuf);
     SAFE_RELEASE(timerQueryHeap);
     SAFE_RELEASE(pipestatsQueryHeap);
diff --git a/renderdoc/driver/d3d12/d3d12_debug.cpp b/renderdoc/driver/d3d12/d3d12_debug.cpp
index c80a57e5f..049a6049b 100644
--- a/renderdoc/driver/d3d12/d3d12_debug.cpp
+++ b/renderdoc/driver/d3d12/d3d12_debug.cpp
@@ -65,7 +65,8 @@ struct D3D12BlobShaderCallbacks
 
     if(FAILED(hr))
     {
-      RDCERR("Couldn't create blob of size %u from shadercache: %08x", size, hr);
+      RDCERR("Couldn't create blob of size %u from shadercache: HRESULT: %s", size,
+             ToStr(hr).c_str());
       return false;
     }
 
@@ -119,7 +120,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
 
   if(FAILED(hr))
   {
-    RDCERR("Couldn't create DXGI factory! 0x%08x", hr);
+    RDCERR("Couldn't create DXGI factory! HRESULT: %s", ToStr(hr).c_str());
   }
 
   D3D12_DESCRIPTOR_HEAP_DESC desc;
@@ -133,7 +134,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
 
   if(FAILED(hr))
   {
-    RDCERR("Couldn't create RTV descriptor heap! 0x%08x", hr);
+    RDCERR("Couldn't create RTV descriptor heap! HRESULT: %s", ToStr(hr).c_str());
   }
 
   desc.NumDescriptors = 16;
@@ -144,7 +145,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
 
   if(FAILED(hr))
   {
-    RDCERR("Couldn't create DSV descriptor heap! 0x%08x", hr);
+    RDCERR("Couldn't create DSV descriptor heap! HRESULT: %s", ToStr(hr).c_str());
   }
 
   desc.NumDescriptors = 4096;
@@ -155,7 +156,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
 
   if(FAILED(hr))
   {
-    RDCERR("Couldn't create CBV/SRV descriptor heap! 0x%08x", hr);
+    RDCERR("Couldn't create CBV/SRV descriptor heap! HRESULT: %s", ToStr(hr).c_str());
   }
 
   desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_SHADER_VISIBLE;
@@ -165,7 +166,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
 
   if(FAILED(hr))
   {
-    RDCERR("Couldn't create CBV/SRV descriptor heap! 0x%08x", hr);
+    RDCERR("Couldn't create CBV/SRV descriptor heap! HRESULT: %s", ToStr(hr).c_str());
   }
 
   desc.NumDescriptors = 16;
@@ -176,7 +177,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
 
   if(FAILED(hr))
   {
-    RDCERR("Couldn't create sampler descriptor heap! 0x%08x", hr);
+    RDCERR("Couldn't create sampler descriptor heap! HRESULT: %s", ToStr(hr).c_str());
   }
 
   {
@@ -208,7 +209,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
 
     if(FAILED(hr))
     {
-      RDCERR("Failed to create rendering texture for pixel picking, HRESULT: 0x%08x", hr);
+      RDCERR("Failed to create rendering texture for pixel picking, HRESULT: %s", ToStr(hr).c_str());
       return;
     }
 
@@ -253,7 +254,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
 
     if(FAILED(hr))
     {
-      RDCERR("Failed to create readback buffer, HRESULT: 0x%08x", hr);
+      RDCERR("Failed to create readback buffer, HRESULT: %s", ToStr(hr).c_str());
       return;
     }
 
@@ -262,7 +263,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
 
     if(FAILED(hr))
     {
-      RDCERR("Failed to create readback command allocator, HRESULT: 0x%08x", hr);
+      RDCERR("Failed to create readback command allocator, HRESULT: %s", ToStr(hr).c_str());
       return;
     }
 
@@ -272,7 +273,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
 
     if(FAILED(hr))
     {
-      RDCERR("Failed to create readback command list, HRESULT: 0x%08x", hr);
+      RDCERR("Failed to create readback command list, HRESULT: %s", ToStr(hr).c_str());
       return;
     }
 
@@ -587,7 +588,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
 
   if(FAILED(hr))
   {
-    RDCERR("Couldn't create m_TexDisplayBlendPipe! 0x%08x", hr);
+    RDCERR("Couldn't create m_TexDisplayBlendPipe! HRESULT: %s", ToStr(hr).c_str());
   }
 
   pipeDesc.BlendState.RenderTarget[0].BlendEnable = FALSE;
@@ -597,7 +598,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
 
   if(FAILED(hr))
   {
-    RDCERR("Couldn't create m_TexDisplayPipe! 0x%08x", hr);
+    RDCERR("Couldn't create m_TexDisplayPipe! HRESULT: %s", ToStr(hr).c_str());
   }
 
   pipeDesc.RTVFormats[0] = DXGI_FORMAT_R8G8B8A8_UNORM;
@@ -607,7 +608,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
 
   if(FAILED(hr))
   {
-    RDCERR("Couldn't create m_TexDisplayPipe! 0x%08x", hr);
+    RDCERR("Couldn't create m_TexDisplayPipe! HRESULT: %s", ToStr(hr).c_str());
   }
 
   pipeDesc.RTVFormats[0] = DXGI_FORMAT_R32G32B32A32_FLOAT;
@@ -617,7 +618,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
 
   if(FAILED(hr))
   {
-    RDCERR("Couldn't create m_TexDisplayF32Pipe! 0x%08x", hr);
+    RDCERR("Couldn't create m_TexDisplayF32Pipe! HRESULT: %s", ToStr(hr).c_str());
   }
 
   pipeDesc.pRootSignature = m_CBOnlyRootSig;
@@ -632,7 +633,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
 
   if(FAILED(hr))
   {
-    RDCERR("Couldn't create m_CheckerboardPipe! 0x%08x", hr);
+    RDCERR("Couldn't create m_CheckerboardPipe! HRESULT: %s", ToStr(hr).c_str());
   }
 
   pipeDesc.SampleDesc.Count = D3D12_MSAA_SAMPLECOUNT;
@@ -642,7 +643,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
 
   if(FAILED(hr))
   {
-    RDCERR("Couldn't create m_CheckerboardMSAAPipe! 0x%08x", hr);
+    RDCERR("Couldn't create m_CheckerboardMSAAPipe! HRESULT: %s", ToStr(hr).c_str());
   }
 
   pipeDesc.SampleDesc.Count = 1;
@@ -661,7 +662,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
 
   if(FAILED(hr))
   {
-    RDCERR("Couldn't create m_OutlinePipe! 0x%08x", hr);
+    RDCERR("Couldn't create m_OutlinePipe! HRESULT: %s", ToStr(hr).c_str());
   }
 
   GetShaderBlob(displayhlsl.c_str(), "RENDERDOC_QuadOverdrawPS", D3DCOMPILE_WARNINGS_ARE_ERRORS,
@@ -692,7 +693,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
 
   if(FAILED(hr))
   {
-    RDCERR("Couldn't create m_QuadResolvePipe! 0x%08x", hr);
+    RDCERR("Couldn't create m_QuadResolvePipe! HRESULT: %s", ToStr(hr).c_str());
   }
 
   m_OverlayRenderTex = NULL;
@@ -724,7 +725,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
 
   if(FAILED(hr))
   {
-    RDCERR("Couldn't create m_MeshPickPipe! 0x%08x", hr);
+    RDCERR("Couldn't create m_MeshPickPipe! HRESULT: %s", ToStr(hr).c_str());
   }
 
   compPipeDesc.pRootSignature = m_HistogramRootSig;
@@ -762,7 +763,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
 
       if(FAILED(hr))
       {
-        RDCERR("Couldn't create m_TileMinMaxPipe! 0x%08x", hr);
+        RDCERR("Couldn't create m_TileMinMaxPipe! HRESULT: %s", ToStr(hr).c_str());
       }
 
       GetShaderBlob(hlsl.c_str(), "RENDERDOC_HistogramCS", D3DCOMPILE_WARNINGS_ARE_ERRORS, "cs_5_0",
@@ -776,7 +777,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
 
       if(FAILED(hr))
       {
-        RDCERR("Couldn't create m_HistogramPipe! 0x%08x", hr);
+        RDCERR("Couldn't create m_HistogramPipe! HRESULT: %s", ToStr(hr).c_str());
       }
 
       if(t == 1)
@@ -792,7 +793,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
 
         if(FAILED(hr))
         {
-          RDCERR("Couldn't create m_HistogramPipe! 0x%08x", hr);
+          RDCERR("Couldn't create m_HistogramPipe! HRESULT: %s", ToStr(hr).c_str());
         }
       }
 
@@ -838,7 +839,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
 
     if(FAILED(hr))
     {
-      RDCERR("Failed to create tile buffer for min/max, HRESULT: 0x%08x", hr);
+      RDCERR("Failed to create tile buffer for min/max, HRESULT: %s", ToStr(hr).c_str());
     }
 
     D3D12_UNORDERED_ACCESS_VIEW_DESC uavDesc = {};
@@ -902,7 +903,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
 
     if(FAILED(hr))
     {
-      RDCERR("Failed to create tile buffer for min/max, HRESULT: 0x%08x", hr);
+      RDCERR("Failed to create tile buffer for min/max, HRESULT: %s", ToStr(hr).c_str());
       return;
     }
 
@@ -964,7 +965,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
 
     if(FAILED(hr))
     {
-      RDCERR("Failed to create result buffer for min/max, HRESULT: 0x%08x", hr);
+      RDCERR("Failed to create result buffer for min/max, HRESULT: %s", ToStr(hr).c_str());
       return;
     }
 
@@ -1021,7 +1022,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
                                                   __uuidof(ID3D12Resource), (void **)&uploadBuf);
 
     if(FAILED(hr))
-      RDCERR("Failed to create uploadBuf %08x", hr);
+      RDCERR("Failed to create uploadBuf HRESULT: %s", ToStr(hr).c_str());
 
     D3D12_RESOURCE_DESC texDesc;
     texDesc.Alignment = 0;
@@ -1043,7 +1044,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
     m_Font.Tex->SetName(L"m_Font.Tex");
 
     if(FAILED(hr))
-      RDCERR("Failed to create m_Font.Tex %08x", hr);
+      RDCERR("Failed to create m_Font.Tex HRESULT: %s", ToStr(hr).c_str());
 
     string font = GetEmbeddedResource(sourcecodepro_ttf);
     byte *ttfdata = (byte *)font.c_str();
@@ -1231,7 +1232,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
                                                       (void **)&m_Font.Pipe[BGRA8_BACKBUFFER]);
 
     if(FAILED(hr))
-      RDCERR("Couldn't create BGRA8 m_Font.Pipe! 0x%08x", hr);
+      RDCERR("Couldn't create BGRA8 m_Font.Pipe! HRESULT: %s", ToStr(hr).c_str());
 
     pipeDesc.RTVFormats[0] = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB;
 
@@ -1239,7 +1240,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
                                                       (void **)&m_Font.Pipe[RGBA8_SRGB_BACKBUFFER]);
 
     if(FAILED(hr))
-      RDCERR("Couldn't create BGRA8 m_Font.Pipe! 0x%08x", hr);
+      RDCERR("Couldn't create BGRA8 m_Font.Pipe! HRESULT: %s", ToStr(hr).c_str());
 
     pipeDesc.RTVFormats[0] = DXGI_FORMAT_R8G8B8A8_UNORM;
 
@@ -1247,7 +1248,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
                                                       (void **)&m_Font.Pipe[RGBA8_BACKBUFFER]);
 
     if(FAILED(hr))
-      RDCERR("Couldn't create RGBA8 m_Font.Pipe! 0x%08x", hr);
+      RDCERR("Couldn't create RGBA8 m_Font.Pipe! HRESULT: %s", ToStr(hr).c_str());
 
     pipeDesc.RTVFormats[0] = DXGI_FORMAT_R16G16B16A16_FLOAT;
 
@@ -1255,7 +1256,7 @@ D3D12DebugManager::D3D12DebugManager(WrappedID3D12Device *wrapper)
                                                       (void **)&m_Font.Pipe[RGBA16_BACKBUFFER]);
 
     if(FAILED(hr))
-      RDCERR("Couldn't create RGBA16 m_Font.Pipe! 0x%08x", hr);
+      RDCERR("Couldn't create RGBA16 m_Font.Pipe! HRESULT: %s", ToStr(hr).c_str());
 
     SAFE_RELEASE(TextVS);
     SAFE_RELEASE(TextPS);
@@ -1395,7 +1396,7 @@ void D3D12DebugManager::CreateSOBuffers()
 
   if(FAILED(hr))
   {
-    RDCERR("Failed to create SO output buffer, HRESULT: 0x%08x", hr);
+    RDCERR("Failed to create SO output buffer, HRESULT: %s", ToStr(hr).c_str());
     return;
   }
 
@@ -1410,7 +1411,7 @@ void D3D12DebugManager::CreateSOBuffers()
 
   if(FAILED(hr))
   {
-    RDCERR("Failed to create readback buffer, HRESULT: 0x%08x", hr);
+    RDCERR("Failed to create readback buffer, HRESULT: %s", ToStr(hr).c_str());
     return;
   }
 
@@ -1427,7 +1428,7 @@ void D3D12DebugManager::CreateSOBuffers()
 
   if(FAILED(hr))
   {
-    RDCERR("Failed to create SO index buffer, HRESULT: 0x%08x", hr);
+    RDCERR("Failed to create SO index buffer, HRESULT: %s", ToStr(hr).c_str());
     return;
   }
 
@@ -1439,7 +1440,7 @@ void D3D12DebugManager::CreateSOBuffers()
 
   if(FAILED(hr))
   {
-    RDCERR("Failed to create SO query heap, HRESULT: 0x%08x", hr);
+    RDCERR("Failed to create SO query heap, HRESULT: %s", ToStr(hr).c_str());
     return;
   }
 
@@ -1852,7 +1853,7 @@ ID3D12Resource *D3D12DebugManager::MakeCBuffer(UINT64 size)
 
   if(FAILED(hr))
   {
-    RDCERR("Couldn't create cbuffer size %llu! 0x%08x", size, hr);
+    RDCERR("Couldn't create cbuffer size %llu! %s", size, ToStr(hr).c_str());
     SAFE_RELEASE(ret);
     return NULL;
   }
@@ -1889,7 +1890,7 @@ void D3D12DebugManager::OutputWindow::MakeRTV(bool multisampled)
 
   if(FAILED(hr))
   {
-    RDCERR("Failed to create colour texture for window, HRESULT: 0x%08x", hr);
+    RDCERR("Failed to create colour texture for window, HRESULT: %s", ToStr(hr).c_str());
     return;
   }
 
@@ -1907,7 +1908,7 @@ void D3D12DebugManager::OutputWindow::MakeRTV(bool multisampled)
 
     if(FAILED(hr))
     {
-      RDCERR("Failed to create resolve texture for window, HRESULT: 0x%08x", hr);
+      RDCERR("Failed to create resolve texture for window, HRESULT: %s", ToStr(hr).c_str());
       return;
     }
   }
@@ -1916,7 +1917,7 @@ void D3D12DebugManager::OutputWindow::MakeRTV(bool multisampled)
 
   if(FAILED(hr))
   {
-    RDCERR("Failed to create RTV for main window, HRESULT: 0x%08x", hr);
+    RDCERR("Failed to create RTV for main window, HRESULT: %s", ToStr(hr).c_str());
     SAFE_RELEASE(swap);
     SAFE_RELEASE(col);
     SAFE_RELEASE(colResolve);
@@ -1953,7 +1954,7 @@ void D3D12DebugManager::OutputWindow::MakeDSV()
 
   if(FAILED(hr))
   {
-    RDCERR("Failed to create DSV texture for output window, HRESULT: 0x%08x", hr);
+    RDCERR("Failed to create DSV texture for output window, HRESULT: %s", ToStr(hr).c_str());
     return;
   }
 
@@ -1961,7 +1962,7 @@ void D3D12DebugManager::OutputWindow::MakeDSV()
 
   if(FAILED(hr))
   {
-    RDCERR("Failed to create DSV for output window, HRESULT: 0x%08x", hr);
+    RDCERR("Failed to create DSV for output window, HRESULT: %s", ToStr(hr).c_str());
     SAFE_RELEASE(swap);
     SAFE_RELEASE(col);
     SAFE_RELEASE(colResolve);
@@ -2004,7 +2005,7 @@ uint64_t D3D12DebugManager::MakeOutputWindow(WindowingSystem system, void *data,
 
   if(FAILED(hr))
   {
-    RDCERR("Failed to create swap chain for HWND, HRESULT: 0x%08x", hr);
+    RDCERR("Failed to create swap chain for HWND, HRESULT: %s", ToStr(hr).c_str());
     return 0;
   }
 
@@ -2090,7 +2091,7 @@ bool D3D12DebugManager::CheckResizeOutputWindow(uint64_t id)
 
       if(FAILED(hr))
       {
-        RDCERR("Failed to resize swap chain, HRESULT: 0x%08x", hr);
+        RDCERR("Failed to resize swap chain, HRESULT: %s", ToStr(hr).c_str());
         return true;
       }
 
@@ -2252,7 +2253,7 @@ void D3D12DebugManager::FillBuffer(ID3D12Resource *buf, size_t offset, const voi
 
   if(FAILED(hr))
   {
-    RDCERR("Can't fill cbuffer %08x", hr);
+    RDCERR("Can't fill cbuffer HRESULT: %s", ToStr(hr).c_str());
   }
   else
   {
@@ -2418,7 +2419,7 @@ void D3D12DebugManager::PickPixel(ResourceId texture, uint32_t x, uint32_t y, ui
 
   if(FAILED(hr))
   {
-    RDCERR("Failed to map picking stage tex %08x", hr);
+    RDCERR("Failed to map picking stage tex HRESULT: %s", ToStr(hr).c_str());
   }
 
   if(pix == NULL)
@@ -2648,7 +2649,7 @@ uint32_t D3D12DebugManager::PickVertex(uint32_t eventID, const MeshDisplay &cfg,
 
       if(FAILED(hr))
       {
-        RDCERR("Couldn't create pick vertex buffer: %08x", hr);
+        RDCERR("Couldn't create pick vertex buffer: HRESULT: %s", ToStr(hr).c_str());
         return ~0U;
       }
 
@@ -3279,7 +3280,7 @@ void D3D12DebugManager::GetBufferData(ID3D12Resource *buffer, uint64_t offset, u
 
     if(FAILED(hr))
     {
-      RDCERR("Failed to map buffer directly for readback %08x", hr);
+      RDCERR("Failed to map buffer directly for readback HRESULT: %s", ToStr(hr).c_str());
       return;
     }
 
@@ -3323,7 +3324,7 @@ void D3D12DebugManager::GetBufferData(ID3D12Resource *buffer, uint64_t offset, u
 
     if(FAILED(hr))
     {
-      RDCERR("Failed to map bufferdata buffer %08x", hr);
+      RDCERR("Failed to map bufferdata buffer HRESULT: %s", ToStr(hr).c_str());
       return;
     }
     else
@@ -3883,7 +3884,7 @@ void D3D12DebugManager::InitPostVSBuffers(uint32_t eventID)
                                                 __uuidof(ID3D12RootSignature), (void **)&soSig);
       if(FAILED(hr))
       {
-        RDCERR("Couldn't enable stream-out in root signature: 0x%08x", hr);
+        RDCERR("Couldn't enable stream-out in root signature: HRESULT: %s", ToStr(hr).c_str());
         return;
       }
 
@@ -3974,7 +3975,7 @@ void D3D12DebugManager::InitPostVSBuffers(uint32_t eventID)
                                                       (void **)&pipe);
     if(FAILED(hr))
     {
-      RDCERR("Couldn't create patched graphics pipeline: 0x%08x", hr);
+      RDCERR("Couldn't create patched graphics pipeline: HRESULT: %s", ToStr(hr).c_str());
       SAFE_RELEASE(soSig);
       return;
     }
@@ -4238,7 +4239,7 @@ void D3D12DebugManager::InitPostVSBuffers(uint32_t eventID)
     hr = m_SOStagingBuffer->Map(0, &range, (void **)&byteData);
     if(FAILED(hr))
     {
-      RDCERR("Failed to map sobuffer %08x", hr);
+      RDCERR("Failed to map sobuffer HRESULT: %s", ToStr(hr).c_str());
       SAFE_RELEASE(idxBuf);
       SAFE_RELEASE(soSig);
       return;
@@ -4466,7 +4467,7 @@ void D3D12DebugManager::InitPostVSBuffers(uint32_t eventID)
                                                       (void **)&pipe);
     if(FAILED(hr))
     {
-      RDCERR("Couldn't create patched graphics pipeline: 0x%08x", hr);
+      RDCERR("Couldn't create patched graphics pipeline: HRESULT: %s", ToStr(hr).c_str());
       SAFE_RELEASE(soSig);
       return;
     }
@@ -4746,7 +4747,7 @@ void D3D12DebugManager::InitPostVSBuffers(uint32_t eventID)
     hr = m_SOStagingBuffer->Map(0, &range, (void **)&byteData);
     if(FAILED(hr))
     {
-      RDCERR("Failed to map sobuffer %08x", hr);
+      RDCERR("Failed to map sobuffer HRESULT: %s", ToStr(hr).c_str());
       SAFE_RELEASE(soSig);
       return;
     }
@@ -5208,7 +5209,7 @@ void D3D12DebugManager::RenderTextInternal(ID3D12GraphicsCommandList *list, floa
 
   if(FAILED(hr) || texs == NULL)
   {
-    RDCERR("Failed to map charbuffer %08x", hr);
+    RDCERR("Failed to map charbuffer HRESULT: %s", ToStr(hr).c_str());
     return;
   }
 
@@ -6407,7 +6408,7 @@ bool D3D12DebugManager::GetMinMax(ResourceId texid, uint32_t sliceFace, uint32_t
 
   if(FAILED(hr))
   {
-    RDCERR("Failed to map bufferdata buffer %08x", hr);
+    RDCERR("Failed to map bufferdata buffer HRESULT: %s", ToStr(hr).c_str());
     return false;
   }
   else
@@ -6572,7 +6573,7 @@ bool D3D12DebugManager::GetHistogram(ResourceId texid, uint32_t sliceFace, uint3
 
   if(FAILED(hr))
   {
-    RDCERR("Failed to map bufferdata buffer %08x", hr);
+    RDCERR("Failed to map bufferdata buffer HRESULT: %s", ToStr(hr).c_str());
     return false;
   }
   else
@@ -6961,7 +6962,7 @@ ResourceId D3D12DebugManager::RenderOverlay(ResourceId texid, CompType typeHint,
         __uuidof(ID3D12Resource), (void **)&customRenderTex);
     if(FAILED(hr))
     {
-      RDCERR("Failed to create custom render tex %08x", hr);
+      RDCERR("Failed to create custom render tex HRESULT: %s", ToStr(hr).c_str());
       return ResourceId();
     }
     wrappedCustomRenderTex = (WrappedID3D12Resource *)customRenderTex;
@@ -6997,7 +6998,7 @@ ResourceId D3D12DebugManager::RenderOverlay(ResourceId texid, CompType typeHint,
                                                   __uuidof(ID3D12Resource), (void **)&renderDepth);
     if(FAILED(hr))
     {
-      RDCERR("Failed to create renderDepth %08x", hr);
+      RDCERR("Failed to create renderDepth HRESULT: %s", ToStr(hr).c_str());
       return m_OverlayResourceId;
     }
 
@@ -7151,7 +7152,7 @@ ResourceId D3D12DebugManager::RenderOverlay(ResourceId texid, CompType typeHint,
           &psoDesc, __uuidof(ID3D12PipelineState), (void **)&pso);
       if(FAILED(hr))
       {
-        RDCERR("Failed to create overlay pso %08x", hr);
+        RDCERR("Failed to create overlay pso HRESULT: %s", ToStr(hr).c_str());
         SAFE_RELEASE(ps);
         return m_OverlayResourceId;
       }
@@ -7226,7 +7227,7 @@ ResourceId D3D12DebugManager::RenderOverlay(ResourceId texid, CompType typeHint,
           &psoDesc, __uuidof(ID3D12PipelineState), (void **)&redPSO);
       if(FAILED(hr))
       {
-        RDCERR("Failed to create overlay pso %08x", hr);
+        RDCERR("Failed to create overlay pso HRESULT: %s", ToStr(hr).c_str());
         SAFE_RELEASE(red);
         SAFE_RELEASE(green);
         return m_OverlayResourceId;
@@ -7241,7 +7242,7 @@ ResourceId D3D12DebugManager::RenderOverlay(ResourceId texid, CompType typeHint,
                                                         (void **)&greenPSO);
       if(FAILED(hr))
       {
-        RDCERR("Failed to create overlay pso %08x", hr);
+        RDCERR("Failed to create overlay pso HRESULT: %s", ToStr(hr).c_str());
         SAFE_RELEASE(red);
         SAFE_RELEASE(redPSO);
         SAFE_RELEASE(green);
@@ -7322,7 +7323,7 @@ ResourceId D3D12DebugManager::RenderOverlay(ResourceId texid, CompType typeHint,
           &psoDesc, __uuidof(ID3D12PipelineState), (void **)&pso);
       if(FAILED(hr))
       {
-        RDCERR("Failed to create overlay pso %08x", hr);
+        RDCERR("Failed to create overlay pso HRESULT: %s", ToStr(hr).c_str());
         SAFE_RELEASE(ps);
         return m_OverlayResourceId;
       }
@@ -7682,7 +7683,7 @@ ResourceId D3D12DebugManager::RenderOverlay(ResourceId texid, CompType typeHint,
           NULL, __uuidof(ID3D12Resource), (void **)&overdrawTex);
       if(FAILED(hr))
       {
-        RDCERR("Failed to create overdrawTex %08x", hr);
+        RDCERR("Failed to create overdrawTex HRESULT: %s", ToStr(hr).c_str());
         list->Close();
         list = NULL;
         return m_OverlayResourceId;
@@ -7835,7 +7836,7 @@ ResourceId D3D12DebugManager::RenderOverlay(ResourceId texid, CompType typeHint,
           &psoDesc, __uuidof(ID3D12PipelineState), (void **)&greenPSO);
       if(FAILED(hr))
       {
-        RDCERR("Failed to create overlay pso %08x", hr);
+        RDCERR("Failed to create overlay pso HRESULT: %s", ToStr(hr).c_str());
         SAFE_RELEASE(red);
         SAFE_RELEASE(green);
         return m_OverlayResourceId;
@@ -7854,7 +7855,7 @@ ResourceId D3D12DebugManager::RenderOverlay(ResourceId texid, CompType typeHint,
                                                         (void **)&redPSO);
       if(FAILED(hr))
       {
-        RDCERR("Failed to create overlay pso %08x", hr);
+        RDCERR("Failed to create overlay pso HRESULT: %s", ToStr(hr).c_str());
         SAFE_RELEASE(redPSO);
         SAFE_RELEASE(red);
         SAFE_RELEASE(green);
diff --git a/renderdoc/driver/d3d12/d3d12_device.cpp b/renderdoc/driver/d3d12/d3d12_device.cpp
index d6b1c9402..0796b62fc 100644
--- a/renderdoc/driver/d3d12/d3d12_device.cpp
+++ b/renderdoc/driver/d3d12/d3d12_device.cpp
@@ -690,7 +690,7 @@ bool WrappedID3D12Device::Serialise_WrapSwapchainBuffer(SerialiserType &ser,
 
     if(FAILED(hr))
     {
-      RDCERR("Failed to create fake back buffer, HRESULT: 0x%08x", hr);
+      RDCERR("Failed to create fake back buffer, HRESULT: %s", ToStr(hr).c_str());
     }
     else
     {
@@ -896,7 +896,7 @@ bool WrappedID3D12Device::Serialise_MapDataWrite(SerialiserType &ser, ID3D12Reso
         }
         else
         {
-          RDCERR("Failed to map resource on replay %08x", hr);
+          RDCERR("Failed to map resource on replay HRESULT: %s", ToStr(hr).c_str());
         }
       }
 
@@ -925,7 +925,7 @@ bool WrappedID3D12Device::Serialise_MapDataWrite(SerialiserType &ser, ID3D12Reso
       }
       else
       {
-        RDCERR("Failed to map resource on replay %08x", hr);
+        RDCERR("Failed to map resource on replay HRESULT: %s", ToStr(hr).c_str());
       }
     }
   }
@@ -1015,7 +1015,7 @@ bool WrappedID3D12Device::Serialise_WriteToSubresource(SerialiserType &ser, ID3D
         }
         else
         {
-          RDCERR("Failed to map resource on replay %08x", hr);
+          RDCERR("Failed to map resource on replay HRESULT: %s", ToStr(hr).c_str());
         }
       }
 
@@ -1043,7 +1043,7 @@ bool WrappedID3D12Device::Serialise_WriteToSubresource(SerialiserType &ser, ID3D
       }
       else
       {
-        RDCERR("Failed to map resource on replay %08x", hr);
+        RDCERR("Failed to map resource on replay HRESULT: %s", ToStr(hr).c_str());
       }
     }
   }
@@ -1525,14 +1525,14 @@ bool WrappedID3D12Device::EndFrameCapture(void *dev, void *wnd)
         }
         else
         {
-          RDCERR("Couldn't map readback buffer: 0x%08x", hr);
+          RDCERR("Couldn't map readback buffer: HRESULT: %s", ToStr(hr).c_str());
         }
 
         SAFE_RELEASE(copyDst);
       }
       else
       {
-        RDCERR("Couldn't create readback buffer: 0x%08x", hr);
+        RDCERR("Couldn't create readback buffer: HRESULT: %s", ToStr(hr).c_str());
       }
     }
 
diff --git a/renderdoc/driver/d3d12/d3d12_device_wrap.cpp b/renderdoc/driver/d3d12/d3d12_device_wrap.cpp
index e444eedcf..5d9dfc178 100644
--- a/renderdoc/driver/d3d12/d3d12_device_wrap.cpp
+++ b/renderdoc/driver/d3d12/d3d12_device_wrap.cpp
@@ -50,7 +50,7 @@ bool WrappedID3D12Device::Serialise_CreateCommandQueue(SerialiserType &ser,
 
     if(FAILED(hr))
     {
-      RDCERR("Failed on resource serialise-creation, HRESULT: 0x%08x", hr);
+      RDCERR("Failed on resource serialise-creation, HRESULT: %s", ToStr(hr).c_str());
     }
     else
     {
@@ -146,7 +146,7 @@ bool WrappedID3D12Device::Serialise_CreateCommandAllocator(SerialiserType &ser,
 
     if(FAILED(hr))
     {
-      RDCERR("Failed on resource serialise-creation, HRESULT: 0x%08x", hr);
+      RDCERR("Failed on resource serialise-creation, HRESULT: %s", ToStr(hr).c_str());
     }
     else
     {
@@ -328,7 +328,7 @@ bool WrappedID3D12Device::Serialise_CreateGraphicsPipelineState(
 
     if(FAILED(hr))
     {
-      RDCERR("Failed on resource serialise-creation, HRESULT: 0x%08x", hr);
+      RDCERR("Failed on resource serialise-creation, HRESULT: %s", ToStr(hr).c_str());
     }
     else
     {
@@ -530,7 +530,7 @@ bool WrappedID3D12Device::Serialise_CreateComputePipelineState(
 
     if(FAILED(hr))
     {
-      RDCERR("Failed on resource serialise-creation, HRESULT: 0x%08x", hr);
+      RDCERR("Failed on resource serialise-creation, HRESULT: %s", ToStr(hr).c_str());
     }
     else
     {
@@ -638,7 +638,7 @@ bool WrappedID3D12Device::Serialise_CreateDescriptorHeap(
 
     if(FAILED(hr))
     {
-      RDCERR("Failed on resource serialise-creation, HRESULT: 0x%08x", hr);
+      RDCERR("Failed on resource serialise-creation, HRESULT: %s", ToStr(hr).c_str());
     }
     else
     {
@@ -723,7 +723,7 @@ bool WrappedID3D12Device::Serialise_CreateRootSignature(SerialiserType &ser, UIN
 
     if(FAILED(hr))
     {
-      RDCERR("Failed on resource serialise-creation, HRESULT: 0x%08x", hr);
+      RDCERR("Failed on resource serialise-creation, HRESULT: %s", ToStr(hr).c_str());
     }
     else
     {
@@ -1155,7 +1155,7 @@ bool WrappedID3D12Device::Serialise_CreateCommittedResource(
 
     if(FAILED(hr))
     {
-      RDCERR("Failed on resource serialise-creation, HRESULT: 0x%08x", hr);
+      RDCERR("Failed on resource serialise-creation, HRESULT: %s", ToStr(hr).c_str());
     }
     else
     {
@@ -1291,7 +1291,7 @@ bool WrappedID3D12Device::Serialise_CreateHeap(SerialiserType &ser, const D3D12_
 
     if(FAILED(hr))
     {
-      RDCERR("Failed on resource serialise-creation, HRESULT: 0x%08x", hr);
+      RDCERR("Failed on resource serialise-creation, HRESULT: %s", ToStr(hr).c_str());
     }
     else
     {
@@ -1384,7 +1384,7 @@ bool WrappedID3D12Device::Serialise_CreatePlacedResource(
 
     if(FAILED(hr))
     {
-      RDCERR("Failed on resource serialise-creation, HRESULT: 0x%08x", hr);
+      RDCERR("Failed on resource serialise-creation, HRESULT: %s", ToStr(hr).c_str());
     }
     else
     {
@@ -1542,7 +1542,7 @@ bool WrappedID3D12Device::Serialise_CreateFence(SerialiserType &ser, UINT64 Init
 
     if(FAILED(hr))
     {
-      RDCERR("Failed on resource serialise-creation, HRESULT: 0x%08x", hr);
+      RDCERR("Failed on resource serialise-creation, HRESULT: %s", ToStr(hr).c_str());
     }
     else
     {
@@ -1614,7 +1614,7 @@ bool WrappedID3D12Device::Serialise_CreateQueryHeap(SerialiserType &ser,
 
     if(FAILED(hr))
     {
-      RDCERR("Failed on resource serialise-creation, HRESULT: 0x%08x", hr);
+      RDCERR("Failed on resource serialise-creation, HRESULT: %s", ToStr(hr).c_str());
     }
     else
     {
@@ -1690,7 +1690,7 @@ bool WrappedID3D12Device::Serialise_CreateCommandSignature(SerialiserType &ser,
 
     if(FAILED(hr))
     {
-      RDCERR("Failed on resource serialise-creation, HRESULT: 0x%08x", hr);
+      RDCERR("Failed on resource serialise-creation, HRESULT: %s", ToStr(hr).c_str());
     }
     else
     {
diff --git a/renderdoc/driver/d3d12/d3d12_hooks.cpp b/renderdoc/driver/d3d12/d3d12_hooks.cpp
index fc6639811..83c669906 100644
--- a/renderdoc/driver/d3d12/d3d12_hooks.cpp
+++ b/renderdoc/driver/d3d12/d3d12_hooks.cpp
@@ -265,7 +265,7 @@ private:
 
     HRESULT ret = createFunc(pAdapter, MinimumFeatureLevel, riid, ppDevice);
 
-    RDCDEBUG("Called real createdevice... 0x%08x", ret);
+    RDCDEBUG("Called real createdevice... HRESULT: %s", ToStr(ret).c_str());
 
     if(SUCCEEDED(ret) && m_EnabledHooks && ppDevice)
     {
@@ -303,7 +303,7 @@ private:
     }
     else
     {
-      RDCDEBUG("failed. 0x%08x", ret);
+      RDCDEBUG("failed. HRESULT: %s", ToStr(ret).c_str());
     }
 
     m_InsideCreate = false;
diff --git a/renderdoc/driver/d3d12/d3d12_initstate.cpp b/renderdoc/driver/d3d12/d3d12_initstate.cpp
index dd18bcab2..e6606b283 100644
--- a/renderdoc/driver/d3d12/d3d12_initstate.cpp
+++ b/renderdoc/driver/d3d12/d3d12_initstate.cpp
@@ -114,7 +114,7 @@ bool D3D12ResourceManager::Prepare_InitialState(ID3D12DeviceChild *res)
       }
       else
       {
-        RDCERR("Couldn't create readback buffer: 0x%08x", hr);
+        RDCERR("Couldn't create readback buffer: HRESULT: %s", ToStr(hr).c_str());
       }
 
       if(nonresident)
@@ -226,7 +226,7 @@ bool D3D12ResourceManager::Prepare_InitialState(ID3D12DeviceChild *res)
       }
       else
       {
-        RDCERR("Couldn't create readback buffer: 0x%08x", hr);
+        RDCERR("Couldn't create readback buffer: HRESULT: %s", ToStr(hr).c_str());
       }
 
       if(nonresident)
@@ -336,7 +336,8 @@ bool D3D12ResourceManager::Serialise_InitialState(SerialiserType &ser, ResourceI
 
       if(FAILED(hr))
       {
-        RDCERR("Failed to create CPU descriptor heap for initial state: 0x%08x", hr);
+        RDCERR("Failed to create CPU descriptor heap for initial state: HRESULT: %s",
+               ToStr(hr).c_str());
         return false;
       }
 
@@ -558,7 +559,7 @@ void D3D12ResourceManager::Apply_InitialState(ID3D12DeviceChild *live, InitialCo
 
         if(FAILED(hr))
         {
-          RDCERR("Doing CPU-side copy, couldn't map source: 0x%08x", hr);
+          RDCERR("Doing CPU-side copy, couldn't map source: HRESULT: %s", ToStr(hr).c_str());
           src = NULL;
         }
 
@@ -568,7 +569,7 @@ void D3D12ResourceManager::Apply_InitialState(ID3D12DeviceChild *live, InitialCo
 
           if(FAILED(hr))
           {
-            RDCERR("Doing CPU-side copy, couldn't map source: 0x%08x", hr);
+            RDCERR("Doing CPU-side copy, couldn't map source: HRESULT: %s", ToStr(hr).c_str());
             dst = NULL;
           }
 
@@ -602,7 +603,7 @@ void D3D12ResourceManager::Apply_InitialState(ID3D12DeviceChild *live, InitialCo
 
             if(FAILED(hr))
             {
-              RDCERR("Doing CPU-side copy, couldn't map source: 0x%08x", hr);
+              RDCERR("Doing CPU-side copy, couldn't map source: HRESULT: %s", ToStr(hr).c_str());
               dst = NULL;
             }
 
diff --git a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp
index 6a09775a2..67b1062fc 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp
@@ -334,7 +334,7 @@ bool WrappedVulkan::Serialise_vkCreateCommandPool(SerialiserType &ser, VkDevice
 
     if(ret != VK_SUCCESS)
     {
-      RDCERR("Failed on resource serialise-creation, VkResult: 0x%08x", ret);
+      RDCERR("Failed on resource serialise-creation, VkResult: %s", ToStr(ret).c_str());
     }
     else
     {
@@ -423,7 +423,7 @@ bool WrappedVulkan::Serialise_vkAllocateCommandBuffers(SerialiserType &ser, VkDe
 
     if(ret != VK_SUCCESS)
     {
-      RDCERR("Failed on resource serialise-creation, VkResult: 0x%08x", ret);
+      RDCERR("Failed on resource serialise-creation, VkResult: %s", ToStr(ret).c_str());
     }
     else
     {
@@ -610,7 +610,7 @@ bool WrappedVulkan::Serialise_vkBeginCommandBuffer(SerialiserType &ser, VkComman
 
         if(ret != VK_SUCCESS)
         {
-          RDCERR("Failed on resource serialise-creation, VkResult: 0x%08x", ret);
+          RDCERR("Failed on resource serialise-creation, VkResult: %s", ToStr(ret).c_str());
         }
         else
         {
@@ -674,7 +674,7 @@ bool WrappedVulkan::Serialise_vkBeginCommandBuffer(SerialiserType &ser, VkComman
 
         if(ret != VK_SUCCESS)
         {
-          RDCERR("Failed on resource serialise-creation, VkResult: 0x%08x", ret);
+          RDCERR("Failed on resource serialise-creation, VkResult: %s", ToStr(ret).c_str());
         }
         else
         {
diff --git a/renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp
index 1c86c3af9..866393181 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp
@@ -173,7 +173,7 @@ bool WrappedVulkan::Serialise_vkCreateDescriptorPool(SerialiserType &ser, VkDevi
 
     if(ret != VK_SUCCESS)
     {
-      RDCERR("Failed on resource serialise-creation, VkResult: 0x%08x", ret);
+      RDCERR("Failed on resource serialise-creation, VkResult: %s", ToStr(ret).c_str());
     }
     else
     {
@@ -244,7 +244,7 @@ bool WrappedVulkan::Serialise_vkCreateDescriptorSetLayout(
 
     if(ret != VK_SUCCESS)
     {
-      RDCERR("Failed on resource serialise-creation, VkResult: 0x%08x", ret);
+      RDCERR("Failed on resource serialise-creation, VkResult: %s", ToStr(ret).c_str());
     }
     else
     {
@@ -365,7 +365,7 @@ bool WrappedVulkan::Serialise_vkAllocateDescriptorSets(SerialiserType &ser, VkDe
 
     if(ret != VK_SUCCESS)
     {
-      RDCERR("Failed on resource serialise-creation, VkResult: 0x%08x", ret);
+      RDCERR("Failed on resource serialise-creation, VkResult: %s", ToStr(ret).c_str());
     }
     else
     {
diff --git a/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
index aa5aacbf6..69c7b4789 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
@@ -406,7 +406,7 @@ bool WrappedVulkan::Serialise_vkCreateSampler(SerialiserType &ser, VkDevice devi
 
     if(ret != VK_SUCCESS)
     {
-      RDCERR("Failed on resource serialise-creation, VkResult: 0x%08x", ret);
+      RDCERR("Failed on resource serialise-creation, VkResult: %s", ToStr(ret).c_str());
     }
     else
     {
@@ -494,7 +494,7 @@ bool WrappedVulkan::Serialise_vkCreateFramebuffer(SerialiserType &ser, VkDevice
 
     if(ret != VK_SUCCESS)
     {
-      RDCERR("Failed on resource serialise-creation, VkResult: 0x%08x", ret);
+      RDCERR("Failed on resource serialise-creation, VkResult: %s", ToStr(ret).c_str());
     }
     else
     {
@@ -698,7 +698,7 @@ bool WrappedVulkan::Serialise_vkCreateRenderPass(SerialiserType &ser, VkDevice d
 
     if(ret != VK_SUCCESS)
     {
-      RDCERR("Failed on resource serialise-creation, VkResult: 0x%08x", ret);
+      RDCERR("Failed on resource serialise-creation, VkResult: %s", ToStr(ret).c_str());
     }
     else
     {
@@ -882,7 +882,7 @@ bool WrappedVulkan::Serialise_vkCreateQueryPool(SerialiserType &ser, VkDevice de
 
     if(ret != VK_SUCCESS)
     {
-      RDCERR("Failed on resource serialise-creation, VkResult: 0x%08x", ret);
+      RDCERR("Failed on resource serialise-creation, VkResult: %s", ToStr(ret).c_str());
     }
     else
     {
diff --git a/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp
index 4dd807a7d..0bc3b3da1 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_resource_funcs.cpp
@@ -163,7 +163,7 @@ bool WrappedVulkan::Serialise_vkAllocateMemory(SerialiserType &ser, VkDevice dev
 
     if(ret != VK_SUCCESS)
     {
-      RDCERR("Failed on resource serialise-creation, VkResult: 0x%08x", ret);
+      RDCERR("Failed on resource serialise-creation, VkResult: %s", ToStr(ret).c_str());
     }
     else
     {
@@ -980,7 +980,7 @@ bool WrappedVulkan::Serialise_vkCreateBuffer(SerialiserType &ser, VkDevice devic
 
     if(ret != VK_SUCCESS)
     {
-      RDCERR("Failed on resource serialise-creation, VkResult: 0x%08x", ret);
+      RDCERR("Failed on resource serialise-creation, VkResult: %s", ToStr(ret).c_str());
     }
     else
     {
@@ -1083,7 +1083,7 @@ bool WrappedVulkan::Serialise_vkCreateBufferView(SerialiserType &ser, VkDevice d
 
     if(ret != VK_SUCCESS)
     {
-      RDCERR("Failed on resource serialise-creation, VkResult: 0x%08x", ret);
+      RDCERR("Failed on resource serialise-creation, VkResult: %s", ToStr(ret).c_str());
     }
     else
     {
@@ -1210,7 +1210,7 @@ bool WrappedVulkan::Serialise_vkCreateImage(SerialiserType &ser, VkDevice device
 
     if(ret != VK_SUCCESS)
     {
-      RDCERR("Failed on resource serialise-creation, VkResult: 0x%08x", ret);
+      RDCERR("Failed on resource serialise-creation, VkResult: %s", ToStr(ret).c_str());
     }
     else
     {
@@ -1492,7 +1492,7 @@ bool WrappedVulkan::Serialise_vkCreateImageView(SerialiserType &ser, VkDevice de
 
     if(ret != VK_SUCCESS)
     {
-      RDCERR("Failed on resource serialise-creation, VkResult: 0x%08x", ret);
+      RDCERR("Failed on resource serialise-creation, VkResult: %s", ToStr(ret).c_str());
     }
     else
     {
diff --git a/renderdoc/driver/vulkan/wrappers/vk_shader_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_shader_funcs.cpp
index a5c5f9455..e119862d5 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_shader_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_shader_funcs.cpp
@@ -110,7 +110,7 @@ bool WrappedVulkan::Serialise_vkCreatePipelineLayout(SerialiserType &ser, VkDevi
 
     if(ret != VK_SUCCESS)
     {
-      RDCERR("Failed on resource serialise-creation, VkResult: 0x%08x", ret);
+      RDCERR("Failed on resource serialise-creation, VkResult: %s", ToStr(ret).c_str());
     }
     else
     {
@@ -210,7 +210,7 @@ bool WrappedVulkan::Serialise_vkCreateShaderModule(SerialiserType &ser, VkDevice
 
     if(ret != VK_SUCCESS)
     {
-      RDCERR("Failed on resource serialise-creation, VkResult: 0x%08x", ret);
+      RDCERR("Failed on resource serialise-creation, VkResult: %s", ToStr(ret).c_str());
     }
     else
     {
@@ -303,7 +303,7 @@ bool WrappedVulkan::Serialise_vkCreatePipelineCache(SerialiserType &ser, VkDevic
 
     if(ret != VK_SUCCESS)
     {
-      RDCERR("Failed on resource serialise-creation, VkResult: 0x%08x", ret);
+      RDCERR("Failed on resource serialise-creation, VkResult: %s", ToStr(ret).c_str());
     }
     else
     {
@@ -395,7 +395,7 @@ bool WrappedVulkan::Serialise_vkCreateGraphicsPipelines(
 
     if(ret != VK_SUCCESS)
     {
-      RDCERR("Failed on resource serialise-creation, VkResult: 0x%08x", ret);
+      RDCERR("Failed on resource serialise-creation, VkResult: %s", ToStr(ret).c_str());
     }
     else
     {
@@ -569,7 +569,7 @@ bool WrappedVulkan::Serialise_vkCreateComputePipelines(SerialiserType &ser, VkDe
 
     if(ret != VK_SUCCESS)
     {
-      RDCERR("Failed on resource serialise-creation, VkResult: 0x%08x", ret);
+      RDCERR("Failed on resource serialise-creation, VkResult: %s", ToStr(ret).c_str());
     }
     else
     {
diff --git a/renderdoc/driver/vulkan/wrappers/vk_sync_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_sync_funcs.cpp
index 8b57ca662..35c29f5cf 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_sync_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_sync_funcs.cpp
@@ -88,7 +88,7 @@ bool WrappedVulkan::Serialise_vkCreateFence(SerialiserType &ser, VkDevice device
 
     if(ret != VK_SUCCESS)
     {
-      RDCERR("Failed on resource serialise-creation, VkResult: 0x%08x", ret);
+      RDCERR("Failed on resource serialise-creation, VkResult: %s", ToStr(ret).c_str());
     }
     else
     {
@@ -275,7 +275,7 @@ bool WrappedVulkan::Serialise_vkCreateEvent(SerialiserType &ser, VkDevice device
 
     if(ret != VK_SUCCESS)
     {
-      RDCERR("Failed on resource serialise-creation, VkResult: 0x%08x", ret);
+      RDCERR("Failed on resource serialise-creation, VkResult: %s", ToStr(ret).c_str());
     }
     else
     {
@@ -447,7 +447,7 @@ bool WrappedVulkan::Serialise_vkCreateSemaphore(SerialiserType &ser, VkDevice de
 
     if(ret != VK_SUCCESS)
     {
-      RDCERR("Failed on resource serialise-creation, VkResult: 0x%08x", ret);
+      RDCERR("Failed on resource serialise-creation, VkResult: %s", ToStr(ret).c_str());
     }
     else
     {