Add a state tab that list uniforms.

Blatantly copied from parameter tab.

diff --git a/gui/apitracecall.cpp b/gui/apitracecall.cpp
index 271a38d684c10173edcf67efe33664de82b1b991..c3f883147fe9f743a8135e08421229e3d93ef301 100644 (file)
--- a/gui/apitracecall.cpp
+++ b/gui/apitracecall.cpp
@@ -607,6 +607,8 @@ ApiTraceState::ApiTraceState(const QVariantMap &parsedJson)
         m_shaderSources[type] = source;
     }
 
+    m_uniforms = parsedJson[QLatin1String("uniforms")].toMap();
+
     QVariantMap textures =
         parsedJson[QLatin1String("textures")].toMap();
     for (itr = textures.constBegin(); itr != textures.constEnd(); ++itr) {
@@ -671,6 +673,11 @@ const QMap<QString, QString> & ApiTraceState::shaderSources() const
     return m_shaderSources;
 }
 
+const QVariantMap & ApiTraceState::uniforms() const
+{
+    return m_uniforms;
+}
+
 bool ApiTraceState::isEmpty() const
 {
     return m_parameters.isEmpty();

diff --git a/gui/apitracecall.h b/gui/apitracecall.h
index 2b6e97c1d22c812aff94455cff62dab1552e817b..7eae245cd3965997ba13c18d99040716205496bc 100644 (file)
--- a/gui/apitracecall.h
+++ b/gui/apitracecall.h
@@ -137,12 +137,14 @@ public:
     bool isEmpty() const;
     const QVariantMap & parameters() const;
     const QMap<QString, QString> & shaderSources() const;
+    const QVariantMap & uniforms() const;
     const QList<ApiTexture> & textures() const;
     const QList<ApiFramebuffer> & framebuffers() const;
 
 private:
     QVariantMap m_parameters;
     QMap<QString, QString> m_shaderSources;
+    QVariantMap m_uniforms;
     QList<ApiTexture> m_textures;
     QList<ApiFramebuffer> m_framebuffers;
 };

diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index b0290ce7fc7e50b1fbcc7a61d37877df8e4d2dc9..7a930f9d0e3a3442c4db623fc30172c40aede636 100644 (file)
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -495,7 +495,7 @@ void MainWindow::fillStateForFrame()
 
     m_ui.uniformsTreeWidget->clear();
     QList<QTreeWidgetItem *> uniformsItems;
-    variantMapToItems(state.uniforms, QVariantMap(), uniformsItems);
+    variantMapToItems(state.uniforms(), QVariantMap(), uniformsItems);
     m_ui.uniformsTreeWidget->insertTopLevelItems(0, uniformsItems);
 
     const QList<ApiTexture> &textures =

diff --git a/gui/ui/mainwindow.ui b/gui/ui/mainwindow.ui
index e6f0af9537a9cbc56af5ceb12527b41bc2f977dd..5b48dc28d54c872845d0f57bb3ddaf611b71f25f 100644 (file)
--- a/gui/ui/mainwindow.ui
+++ b/gui/ui/mainwindow.ui
@@ -208,6 +208,39 @@
          </item>
         </layout>
        </widget>
+       <widget class="QWidget" name="uniformsTab">
+        <attribute name="title">
+         <string>Uniforms</string>
+        </attribute>
+        <layout class="QVBoxLayout" name="verticalLayout_6">
+         <item>
+          <widget class="QTreeWidget" name="uniformsTreeWidget">
+           <property name="editTriggers">
+            <set>QAbstractItemView::NoEditTriggers</set>
+           </property>
+           <property name="alternatingRowColors">
+            <bool>true</bool>
+           </property>
+           <property name="sortingEnabled">
+            <bool>true</bool>
+           </property>
+           <property name="allColumnsShowFocus">
+            <bool>true</bool>
+           </property>
+           <column>
+            <property name="text">
+             <string>Name</string>
+            </property>
+           </column>
+           <column>
+            <property name="text">
+             <string>Value</string>
+            </property>
+           </column>
+          </widget>
+         </item>
+        </layout>
+       </widget>
       </widget>
      </item>
     </layout>