UI: Add 'GL Context' column to API call tree to help with multi-context debugging.

(cherry picked from commit 39e0f793e3588b12e0444241b9b4a2859bc8b18f)

diff --git a/src/vogleditor/vogleditor_apicalltreeitem.cpp b/src/vogleditor/vogleditor_apicalltreeitem.cpp
index 5a66db872469cf72c62274e22df61680664cfbf2..32ff10ac4f57a8987177218f83d820bf8b8904c1 100644 (file)
--- a/src/vogleditor/vogleditor_apicalltreeitem.cpp
+++ b/src/vogleditor/vogleditor_apicalltreeitem.cpp
@@ -40,6 +40,7 @@ vogleditor_apiCallTreeItem::vogleditor_apiCallTreeItem(vogleditor_QApiCallTreeMo
     m_columnData[VOGL_ACTC_APICALL] = "API Call";
     m_columnData[VOGL_ACTC_INDEX] = "Index";
     m_columnData[VOGL_ACTC_FLAGS] = "";
     m_columnData[VOGL_ACTC_APICALL] = "API Call";
     m_columnData[VOGL_ACTC_INDEX] = "Index";
     m_columnData[VOGL_ACTC_FLAGS] = "";

+    m_columnData[VOGL_ACTC_GLCONTEXT] = "GL Context";

     //m_ColumnTitles[VOGL_ACTC_BEGINTIME] = "Begin Time";
     //m_ColumnTitles[VOGL_ACTC_ENDTIME] = "End Time";
     m_columnData[VOGL_ACTC_DURATION] = "Duration (ns)";
     //m_ColumnTitles[VOGL_ACTC_BEGINTIME] = "Begin Time";
     //m_ColumnTitles[VOGL_ACTC_ENDTIME] = "End Time";
     m_columnData[VOGL_ACTC_DURATION] = "Duration (ns)";


@@ -78,6 +79,8 @@ vogleditor_apiCallTreeItem::vogleditor_apiCallTreeItem(QString nodeText, vogledi
    {
       m_columnData[VOGL_ACTC_INDEX] = (qulonglong)apiCallItem->globalCallIndex();
       m_columnData[VOGL_ACTC_FLAGS] = "";
    {
       m_columnData[VOGL_ACTC_INDEX] = (qulonglong)apiCallItem->globalCallIndex();
       m_columnData[VOGL_ACTC_FLAGS] = "";

+      dynamic_string strContext;
+      m_columnData[VOGL_ACTC_GLCONTEXT] = strContext.format("0x%" PRIx64, apiCallItem->getGLPacket()->m_context_handle).c_str();

       //m_columnData[VOGL_ACTC_BEGINTIME] = apiCallItem->startTime();
       //m_columnData[VOGL_ACTC_ENDTIME] = apiCallItem->endTime();
       m_columnData[VOGL_ACTC_DURATION] = (qulonglong)apiCallItem->duration();
       //m_columnData[VOGL_ACTC_BEGINTIME] = apiCallItem->startTime();
       //m_columnData[VOGL_ACTC_ENDTIME] = apiCallItem->endTime();
       m_columnData[VOGL_ACTC_DURATION] = (qulonglong)apiCallItem->duration();

diff --git a/src/vogleditor/vogleditor_apicalltreeitem.h b/src/vogleditor/vogleditor_apicalltreeitem.h
index 2f94f9b209a8ff0c05e0014b62a417eb8bb3bfb7..9957a72758b1032c2d531c3533cf6e0bb2f9701c 100644 (file)
--- a/src/vogleditor/vogleditor_apicalltreeitem.h
+++ b/src/vogleditor/vogleditor_apicalltreeitem.h
@@ -40,6 +40,7 @@ enum VOGL_API_CALL_TREE_COLUMN
 {
     VOGL_ACTC_APICALL,
     VOGL_ACTC_INDEX,
 {
     VOGL_ACTC_APICALL,
     VOGL_ACTC_INDEX,

+    VOGL_ACTC_GLCONTEXT,

     VOGL_ACTC_FLAGS,
 //    VOGL_ACTC_BEGINTIME,
 //    VOGL_ACTC_ENDTIME,
     VOGL_ACTC_FLAGS,
 //    VOGL_ACTC_BEGINTIME,
 //    VOGL_ACTC_ENDTIME,