d3dretrace: Use DirectXTex for d3d10 state too.

[apitrace] / gui / apisurface.cpp

diff --git a/gui/apisurface.cpp b/gui/apisurface.cpp
index 1123ead1668393be8d1615c59b842bad6665083a..d17560f4ca7e62c0eba638099bc302399eabf6d7 100644 (file)
--- a/gui/apisurface.cpp
+++ b/gui/apisurface.cpp
@@ -1,4 +1,5 @@
 #include "apisurface.h"
+#include "thumbnail.h"
 
 #include <QDebug>
 #include <QSysInfo>
@@ -17,22 +18,11 @@ void ApiSurface::setSize(const QSize &size)
     m_size = size;
 }
 
-int ApiSurface::numChannels() const
-{
-    return m_numChannels;
-}
-
-void ApiSurface::setNumChannels(int numChannels)
-{
-    m_numChannels = numChannels;
-}
-
 void ApiSurface::contentsFromBase64(const QByteArray &base64)
 {
     QByteArray dataArray = QByteArray::fromBase64(base64);
     m_image.loadFromData(dataArray, "png");
-    m_image = m_image.mirrored();
-    m_thumb = m_image.scaled(64, 64, Qt::KeepAspectRatio);
+    m_thumb = thumbnail(m_image);
 }
 
 QImage ApiSurface::image() const
@@ -45,41 +35,40 @@ QImage ApiSurface::thumb() const
     return m_thumb;
 }
 
-ApiTexture::ApiTexture()
-    : ApiSurface(),
-      m_unit(0),
-      m_level(0)
+int ApiSurface::depth() const
 {
+    return m_depth;
 }
 
-int ApiTexture::unit() const
+void ApiSurface::setDepth(int depth)
 {
-    return m_unit;
+    m_depth = depth;
 }
 
-void ApiTexture::setUnit(int un)
+QString ApiSurface::formatName() const
 {
-    m_unit = un;
+    return m_formatName;
 }
 
-QString ApiTexture::target() const
+void ApiSurface::setFormatName(const QString &str)
 {
-    return m_target;
+    m_formatName = str;
 }
 
-void ApiTexture::setTarget(const QString &str)
+
+ApiTexture::ApiTexture()
+    : ApiSurface()
 {
-    m_target = str;
 }
 
-int ApiTexture::level() const
+QString ApiTexture::label() const
 {
-    return m_level;
+    return m_label;
 }
 
-void ApiTexture::setLevel(int l)
+void ApiTexture::setLabel(const QString &str)
 {
-    m_level = l;
+    m_label = str;
 }
 
 ApiFramebuffer::ApiFramebuffer()
@@ -96,3 +85,4 @@ void ApiFramebuffer::setType(const QString &str)
 {
     m_type = str;
 }
+