summaryrefslogtreecommitdiffstats
path: root/src/api/studio3d/q3dspresentation.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/api/studio3d/q3dspresentation.h')
-rw-r--r--src/api/studio3d/q3dspresentation.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/api/studio3d/q3dspresentation.h b/src/api/studio3d/q3dspresentation.h
index 5210a29..6d25a74 100644
--- a/src/api/studio3d/q3dspresentation.h
+++ b/src/api/studio3d/q3dspresentation.h
@@ -38,6 +38,7 @@
#include <QtCore/qstringlist.h>
#include <QtStudio3D/q3dsdatainput.h>
#include <QtStudio3D/q3dsdataoutput.h>
+#include <QtGui/qopengl.h>
QT_BEGIN_NAMESPACE
@@ -95,6 +96,12 @@ public:
Q_REVISION(1) Q_INVOKABLE void exportShaderCache(const QUrl &shaderCacheFile,
bool binaryShaders);
Q_REVISION(1) Q_INVOKABLE void exportShaderCache(bool binaryShaders);
+ void exportShaderCache(QByteArray &cacheData, bool binaryShaders);
+ Q_REVISION(2) Q_INVOKABLE void exportShaderCache(const QUrl &shaderCacheFile,
+ bool binaryShaders, int compressionLevel);
+ Q_REVISION(2) Q_INVOKABLE void exportShaderCache(bool binaryShaders, int compressionLevel);
+ void exportShaderCache(QByteArray &cacheData, bool binaryShaders, int compressionLevel);
+ void setShaderCacheData(const QByteArray &shaderCache);
QUrl shaderCacheFile() const;
// Input event handlers
@@ -128,6 +135,7 @@ public:
void addImageProvider(const QString &providerId, QQmlImageProviderBase *provider);
uint textureId(const QString &elementPath);
+ uint textureId(const QString &elementPath, QSize &size, GLenum &format);
public Q_SLOTS:
void setSource(const QUrl &source);
@@ -158,6 +166,7 @@ Q_SIGNALS:
void meshesCreated(const QStringList &meshNames, const QString &error);
void shaderCacheFileChanged(const QUrl &fileName);
void shaderCacheExported(bool success);
+ void shaderCacheLoadErrors(const QString &errors);
private:
Q_DISABLE_COPY(Q3DSPresentation)