CODEXL-3096 "Hotspot Summary -> Command Buffers Summary" does not list all the command buffers

Sigalalg · Sigalalg · commit 05a8813f5e1a · 2016-05-30T15:10:11.000+03:00
diff --git a/CodeXL/Components/GpuProfiling/AMDTGpuProfiling/gpTraceDataContainer.cpp b/CodeXL/Components/GpuProfiling/AMDTGpuProfiling/gpTraceDataContainer.cpp
@@ -1082,7 +1082,10 @@ void gpTraceDataContainer::CloseCommandList(APIInfo* pAPIInfo)
                 m_commandListUnAttachedCalls.removeOne(pItem);
             }
 
-            m_commandListInstancesVector << currentInstanceData;
+            if (!currentInstanceData.m_sampleIds.isEmpty())
+            {
+                m_commandListInstancesVector << currentInstanceData;
+            }
         }
     }
 }
@@ -1315,7 +1318,15 @@ QString gpTraceDataContainer::QueueDisplayName(const QString& queuePtrStr)
 
 int gpTraceDataContainer::CommandListCount()const
 {
-    return m_commandListPointerToIndexMap.size();
+    int retVal = 0;
+    for (auto iter = m_commandListInstancesVector.begin(); iter!= m_commandListInstancesVector.end(); iter++)
+    {
+        if (!(*iter).m_apiIndices.isEmpty())
+        {
+            retVal++;
+        }
+    }
+    return retVal;
 }
 
 void gpTraceDataContainer::AddBakedCommandBuffer(VKGPUTraceInfo* pAPIInfo)

Original file line number	Diff line number	Diff line change
`@@ -1082,7 +1082,10 @@ void gpTraceDataContainer::CloseCommandList(APIInfo* pAPIInfo)`
`1082`	`1082`	`m_commandListUnAttachedCalls.removeOne(pItem);`
`1083`	`1083`	`}`
`1084`	`1084`
`1085`		`- m_commandListInstancesVector << currentInstanceData;`
	`1085`	`+ if (!currentInstanceData.m_sampleIds.isEmpty())`
	`1086`	`+ {`
	`1087`	`+ m_commandListInstancesVector << currentInstanceData;`
	`1088`	`+ }`
`1086`	`1089`	`}`
`1087`	`1090`	`}`
`1088`	`1091`	`}`
`@@ -1315,7 +1318,15 @@ QString gpTraceDataContainer::QueueDisplayName(const QString& queuePtrStr)`
`1315`	`1318`
`1316`	`1319`	`int gpTraceDataContainer::CommandListCount()const`
`1317`	`1320`	`{`
`1318`		`- return m_commandListPointerToIndexMap.size();`
	`1321`	`+ int retVal = 0;`
	`1322`	`+ for (auto iter = m_commandListInstancesVector.begin(); iter!= m_commandListInstancesVector.end(); iter++)`
	`1323`	`+ {`
	`1324`	`+ if (!(*iter).m_apiIndices.isEmpty())`
	`1325`	`+ {`
	`1326`	`+ retVal++;`
	`1327`	`+ }`
	`1328`	`+ }`
	`1329`	`+ return retVal;`
`1319`	`1330`	`}`
`1320`	`1331`
`1321`	`1332`	`void gpTraceDataContainer::AddBakedCommandBuffer(VKGPUTraceInfo* pAPIInfo)`