Merge pull request #70 from janisozaur/missing-headers

Add missing headers
GPUOpen-Tools · Sep 9, 2020 · 6874d57 · 6874d57
2 parents e04f97d + bdc93d9
commit 6874d57
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 33 deletions.
diff --git a/RadeonGPUAnalyzerGUI/Src/rgIsaDisassemblyView.cpp b/RadeonGPUAnalyzerGUI/Src/rgIsaDisassemblyView.cpp
@@ -12,6 +12,7 @@
 #include <algorithm>
 
 // Qt.
+#include <QAction>
 #include <QCheckBox>
 #include <QListWidgetItem>
 
@@ -700,39 +701,39 @@ void rgIsaDisassemblyView::PopulateTargetGpuList(const rgBuildOutputsMap& buildO
     assert(!targets.empty());
 
     // Sort and choose the latest target.
-    std::sort(targets.begin(),
+    std::sort(targets.begin(),
         targets.end(), [&](const std::string& a, const std::string& b)
     {
-        const char* GFX_NOTATION_TOKEN = "gfx";
-        bool ret = true;
-        size_t szA = a.find(GFX_NOTATION_TOKEN);
-        size_t szB = b.find(GFX_NOTATION_TOKEN);
-        if (szA == std::string::npos && szB == std::string::npos)
-        {
-            // Neither name is in gfx-notation, compare using standard string logic.
-            ret = a.compare(b) < 0;
-        }
-        else if (!(szA != std::string::npos && szB != std::string::npos))
-        {
-            // Only one name has the gfx notation, assume that it is a newer generation.
-            ret = (szB != std::string::npos);
-        }
-        else
-        {
-            // Both names are in gfx notation, compare according to the number.
-            std::vector<std::string> splitA;
-            std::vector<std::string> splitB;
-            rgUtils::splitString(a, 'x', splitA);
-            rgUtils::splitString(b, 'x', splitB);
-            assert(splitA.size() > 1);
-            assert(splitB.size() > 1);
-            if (splitA.size() > 1 && splitB.size() > 1)
-            {
-                int numA = std::stoi(splitA[1], nullptr);
-                int numB = std::stoi(splitB[1], nullptr);
-                ret = ((numB - numA) > 0);
-            }
-        }
+        const char* GFX_NOTATION_TOKEN = "gfx";
+        bool ret = true;
+        size_t szA = a.find(GFX_NOTATION_TOKEN);
+        size_t szB = b.find(GFX_NOTATION_TOKEN);
+        if (szA == std::string::npos && szB == std::string::npos)
+        {
+            // Neither name is in gfx-notation, compare using standard string logic.
+            ret = a.compare(b) < 0;
+        }
+        else if (!(szA != std::string::npos && szB != std::string::npos))
+        {
+            // Only one name has the gfx notation, assume that it is a newer generation.
+            ret = (szB != std::string::npos);
+        }
+        else
+        {
+            // Both names are in gfx notation, compare according to the number.
+            std::vector<std::string> splitA;
+            std::vector<std::string> splitB;
+            rgUtils::splitString(a, 'x', splitA);
+            rgUtils::splitString(b, 'x', splitB);
+            assert(splitA.size() > 1);
+            assert(splitB.size() > 1);
+            if (splitA.size() > 1 && splitB.size() > 1)
+            {
+                int numA = std::stoi(splitA[1], nullptr);
+                int numB = std::stoi(splitB[1], nullptr);
+                ret = ((numB - numA) > 0);
+            }
+        }
         return !ret;
     });
 
@@ -1239,4 +1240,4 @@ void rgIsaDisassemblyView::HandleSelectNextGPUTargetAction()
         currentRow = 0;
     }
     m_pTargetGpusListWidget->setCurrentRow(currentRow);
-}
+}
diff --git a/RadeonGPUAnalyzerGUI/Src/rgModePushButton.cpp b/RadeonGPUAnalyzerGUI/Src/rgModePushButton.cpp
@@ -1,5 +1,6 @@
 // Qt.
 #include <QPainter>
+#include <QPainterPath>
 #include <QPoint>
 #include <QStyle>
 #include <QWidget>

diff --git a/RadeonGPUAnalyzerGUI/Src/rgSettingsButtonsView.cpp b/RadeonGPUAnalyzerGUI/Src/rgSettingsButtonsView.cpp
@@ -4,6 +4,7 @@
 
 // Qt.
 #include <QApplication>
+#include <QAction>
 #include <QCheckBox>
 #include <QFileDialog>
 #include <QMessageBox>
@@ -112,4 +113,4 @@ void rgSettingsButtonsView::HideRestoreDefaultSettingsButton(bool isHidden)
 void rgSettingsButtonsView::mousePressEvent(QMouseEvent *pEvent)
 {
     emit SettingsButtonsViewClickedSignal();
-}
+}