Merge branch 'master' into d3dretrace

[apitrace] / gui / apisurface.h

diff --git a/gui/apisurface.h b/gui/apisurface.h
index 3dd0ea58fb54b2434cc94cb549fe22fe5ea1395f..bc403af27409c103deeeb431710a67238f6481f1 100644 (file)
--- a/gui/apisurface.h
+++ b/gui/apisurface.h
@@ -16,6 +16,12 @@ public:
     int numChannels() const;
     void setNumChannels(int numChannels);
 
+    int depth() const;
+    void setDepth(int depth);
+
+    QString formatName() const;
+    void setFormatName(const QString &str);
+
     void contentsFromBase64(const QByteArray &base64);
 
     QImage image() const;
@@ -26,6 +32,8 @@ private:
     int m_numChannels;
     QImage m_image;
     QImage m_thumb;
+    int m_depth;
+    QString m_formatName;
 };
 
 
@@ -34,19 +42,11 @@ class ApiTexture : public ApiSurface
 public:
     ApiTexture();
 
-    int unit() const;
-    void setUnit(int un);
-
-    int level() const;
-    void setLevel(int l);
-
-    QString target() const;
-    void setTarget(const QString &str);
+    QString label() const;
+    void setLabel(const QString &str);
 
 private:
-    int m_unit;
-    int m_level;
-    QString m_target;
+    QString m_label;
 };
 
 class ApiFramebuffer : public ApiSurface