QTexture: cleanup

Load compressed files in QFromSourceTextureGenerator
and remove related code from QTextureImageData. Unify
loading code paths for texture generator and image.

Change-Id: Iebeb67bf1e542f55af06880b1d725c2de70b8ccb
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

1 files changed, 19 insertions, 11 deletions

diff --git a/src/render/texture/qtextureimagedata.h b/src/render/texture/qtextureimagedata.h
index c1cc40593..6d66f2390 100644
--- a/src/render/texture/qtextureimagedata.h
+++ b/src/render/texture/qtextureimagedata.h
@@ -71,24 +71,32 @@ public:
     int mipLevels() const Q_DECL_NOTHROW;
     int faces() const Q_DECL_NOTHROW;
 
-    QOpenGLTexture::Target target() const Q_DECL_NOTHROW;
-
-    QOpenGLTexture::TextureFormat format() const Q_DECL_NOTHROW;
+    void setWidth(int width) Q_DECL_NOTHROW;
+    void setHeight(int height) Q_DECL_NOTHROW;
+    void setDepth(int depth) Q_DECL_NOTHROW;
 
-    void setImage(const QImage &);
+    void setLayers(int layers) Q_DECL_NOTHROW;
+    void setMipLevels(int mipLevels) Q_DECL_NOTHROW;
+    void setFaces(int faces) Q_DECL_NOTHROW;
 
-    void setData(const QByteArray &data,
-                 QOpenGLTexture::PixelFormat fmt,
-                 QOpenGLTexture::PixelType ptype);
+    QOpenGLTexture::Target target() const Q_DECL_NOTHROW;
+    QOpenGLTexture::TextureFormat format() const Q_DECL_NOTHROW;
 
-    bool setCompressedFile(const QString &source);
+    QOpenGLTexture::PixelFormat pixelFormat() const Q_DECL_NOTHROW;
+    QOpenGLTexture::PixelType pixelType() const Q_DECL_NOTHROW;
 
-    QByteArray data(int layer = 0, int face = 0, int mipmapLevel = 0) const;
+    void setTarget(QOpenGLTexture::Target target) Q_DECL_NOTHROW;
+    void setFormat(QOpenGLTexture::TextureFormat format) Q_DECL_NOTHROW;
 
-    QOpenGLTexture::PixelFormat pixelFormat() const Q_DECL_NOTHROW;
+    void setPixelFormat(QOpenGLTexture::PixelFormat pixelFormat) Q_DECL_NOTHROW;
+    void setPixelType(QOpenGLTexture::PixelType pixelType) Q_DECL_NOTHROW;
 
-    QOpenGLTexture::PixelType pixelType() const Q_DECL_NOTHROW;
+    void setImage(const QImage &);
+    void setData(const QByteArray &data,
+                 int blockSize,
+                 bool isCompressed = false);
 
+    QByteArray data(int layer = 0, int face = 0, int mipmapLevel = 0) const;
 protected:
     QTextureImageData(QTextureImageDataPrivate &dd);