diff --git a/renderdoc/driver/d3d12/d3d12_commands.cpp b/renderdoc/driver/d3d12/d3d12_commands.cpp
index a5a060bfe..32920cc82 100644
--- a/renderdoc/driver/d3d12/d3d12_commands.cpp
+++ b/renderdoc/driver/d3d12/d3d12_commands.cpp
@@ -715,7 +715,7 @@ void D3D12CommandData::AddEvent(D3D12ChunkType type, string description)
     memcpy(apievent.callstack.elems, stack->GetAddrs(), sizeof(uint64_t) * stack->NumLevels());
   }
 
-  // TODO have real m_EventMessages
+  D3D12NOTIMP("debug messages");
   vector<DebugMessage> m_EventMessages;
 
   for(size_t i = 0; i < m_EventMessages.size(); i++)
@@ -734,7 +734,8 @@ void D3D12CommandData::AddEvent(D3D12ChunkType type, string description)
     m_RootEvents.push_back(apievent);
     m_Events.push_back(apievent);
 
-    // TODO m_DebugMessages.insert(m_DebugMessages.end(), m_EventMessages.begin(),
+    D3D12NOTIMP("debug messages");
+    // m_DebugMessages.insert(m_DebugMessages.end(), m_EventMessages.begin(),
     // m_EventMessages.end());
   }
 
@@ -761,8 +762,6 @@ void D3D12CommandData::AddDrawcall(const FetchDrawcall &d, bool hasEvents)
 
   if(m_LastCmdListID != ResourceId())
   {
-    // TODO fill from m_BakedCmdListInfo[m_LastCmdListID].state
-
     draw.topology = MakePrimitiveTopology(m_BakedCmdListInfo[m_LastCmdListID].state.topo);
     draw.indexByteWidth = m_BakedCmdListInfo[m_LastCmdListID].state.idxWidth;
 
@@ -793,7 +792,7 @@ void D3D12CommandData::AddDrawcall(const FetchDrawcall &d, bool hasEvents)
 
     node.resourceUsage.swap(m_BakedCmdListInfo[m_LastCmdListID].resourceUsage);
 
-    // TODO add usage
+    D3D12NOTIMP("event usage");
 
     node.children.insert(node.children.begin(), draw.children.elems,
                          draw.children.elems + draw.children.count);
diff --git a/renderdoc/driver/d3d12/d3d12_debug.cpp b/renderdoc/driver/d3d12/d3d12_debug.cpp
index c198a2e7c..06c60dbb4 100644
--- a/renderdoc/driver/d3d12/d3d12_debug.cpp
+++ b/renderdoc/driver/d3d12/d3d12_debug.cpp
@@ -1420,7 +1420,8 @@ bool D3D12DebugManager::RenderTexture(TextureDisplay cfg, bool blendAlpha)
 
   pixelData.FlipY = cfg.FlipY ? 1 : 0;
 
-  // TODO GetShaderDetails(cfg.texid, cfg.typeHint, cfg.rawoutput ? true : false);
+  D3D12NOTIMP("proper texture display");
+  // GetShaderDetails(cfg.texid, cfg.typeHint, cfg.rawoutput ? true : false);
   WrappedID3D12Resource *resource = WrappedID3D12Resource::m_List[cfg.texid];
   D3D12_RESOURCE_DESC resourceDesc = resource->GetDesc();
 
diff --git a/renderdoc/driver/d3d12/d3d12_replay.cpp b/renderdoc/driver/d3d12/d3d12_replay.cpp
index 761beecb9..f0450d2cf 100644
--- a/renderdoc/driver/d3d12/d3d12_replay.cpp
+++ b/renderdoc/driver/d3d12/d3d12_replay.cpp
@@ -108,7 +108,8 @@ FetchBuffer D3D12Replay::GetBuffer(ResourceId id)
 
   ret.length = desc.Width;
 
-  // TODO maybe improve these through usage tracking? 'implicit' creation flags
+  D3D12NOTIMP("Buffer creation flags from implicit usage");
+
   ret.creationFlags = eBufferCreate_VB | eBufferCreate_IB | eBufferCreate_CB | eBufferCreate_Indirect;
   if(desc.Flags & D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS)
     ret.creationFlags |= eBufferCreate_UAV;
@@ -155,7 +156,7 @@ FetchTexture D3D12Replay::GetTexture(ResourceId id)
     case 3: ret.resType = eResType_Texture3D; break;
   }
 
-  // TODO determine this from usage?
+  D3D12NOTIMP("Texture cubemap-ness from implicit usage");
   ret.cubemap = false;    // eResType_TextureCube, eResType_TextureCubeArray
 
   ret.creationFlags = eTextureCreate_SRV;