QmlDesigner: Complete shaders baking for effect maker

Also add versioning support

Task-number: QDS-10499
Change-Id: If75222e3569d361b0d7bece70867e4020132c1bd
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Amr Essam
2023-09-25 10:44:31 +03:00
committed by Amr Elsayed
parent 533f743edc
commit 02abf29fa5
2 changed files with 86 additions and 1 deletions

View File

@@ -14,9 +14,41 @@
namespace EffectMaker { namespace EffectMaker {
enum class FileType
{
Binary,
Text
};
static bool writeToFile(const QByteArray &buf, const QString &filename, FileType fileType)
{
QDir().mkpath(QFileInfo(filename).path());
QFile f(filename);
QIODevice::OpenMode flags = QIODevice::WriteOnly | QIODevice::Truncate;
if (fileType == FileType::Text)
flags |= QIODevice::Text;
if (!f.open(flags)) {
qWarning() << "Failed to open file for writing:" << filename;
return false;
}
f.write(buf);
return true;
}
EffectMakerModel::EffectMakerModel(QObject *parent) EffectMakerModel::EffectMakerModel(QObject *parent)
: QAbstractListModel{parent} : QAbstractListModel{parent}
{ {
m_vertexShaderFile.setFileTemplate(QDir::tempPath() + "/dsem_XXXXXX.vert.qsb");
m_fragmentShaderFile.setFileTemplate(QDir::tempPath() + "/dsem_XXXXXX.frag.qsb");
// TODO: Will be revisted later when saving output files
if (m_vertexShaderFile.open())
qInfo() << "Using temporary vs file:" << m_vertexShaderFile.fileName();
if (m_fragmentShaderFile.open())
qInfo() << "Using temporary fs file:" << m_fragmentShaderFile.fileName();
// Prepare baker
m_baker.setGeneratedShaderVariants({ QShader::StandardShader });
updateBakedShaderVersions();
} }
QHash<int, QByteArray> EffectMakerModel::roleNames() const QHash<int, QByteArray> EffectMakerModel::roleNames() const
@@ -97,6 +129,21 @@ void EffectMakerModel::removeNode(int idx)
setIsEmpty(true); setIsEmpty(true);
} }
void EffectMakerModel::updateBakedShaderVersions()
{
QList<QShaderBaker::GeneratedShader> targets;
targets.append({ QShader::SpirvShader, QShaderVersion(100) }); // Vulkan 1.0
targets.append({ QShader::HlslShader, QShaderVersion(50) }); // Shader Model 5.0
targets.append({ QShader::MslShader, QShaderVersion(12) }); // Metal 1.2
targets.append({ QShader::GlslShader, QShaderVersion(300, QShaderVersion::GlslEs) }); // GLES 3.0+
targets.append({ QShader::GlslShader, QShaderVersion(410) }); // OpenGL 4.1+
targets.append({ QShader::GlslShader, QShaderVersion(330) }); // OpenGL 3.3
targets.append({ QShader::GlslShader, QShaderVersion(140) }); // OpenGL 3.1
//TODO: Do we need support for legacy shaders 100, 120?
m_baker.setGeneratedShaders(targets);
}
QString EffectMakerModel::fragmentShader() const QString EffectMakerModel::fragmentShader() const
{ {
return m_fragmentShader; return m_fragmentShader;
@@ -744,7 +791,40 @@ void EffectMakerModel::bakeShaders()
updateCustomUniforms(); updateCustomUniforms();
// TODO: Shaders baking setVertexShader(generateVertexShader());
QString vs = m_vertexShader;
m_baker.setSourceString(vs.toUtf8(), QShader::VertexStage);
QShader vertShader = m_baker.bake();
if (!vertShader.isValid()) {
qWarning() << "Shader baking failed:" << qPrintable(m_baker.errorMessage());
setEffectError(m_baker.errorMessage().split('\n').first(), ErrorVert);
} else {
QString filename = m_vertexShaderFile.fileName();
writeToFile(vertShader.serialized(), filename, FileType::Binary);
resetEffectError(ErrorVert);
}
setFragmentShader(generateFragmentShader());
QString fs = m_fragmentShader;
m_baker.setSourceString(fs.toUtf8(), QShader::FragmentStage);
QShader fragShader = m_baker.bake();
if (!fragShader.isValid()) {
qWarning() << "Shader baking failed:" << qPrintable(m_baker.errorMessage());
setEffectError(m_baker.errorMessage().split('\n').first(), ErrorFrag);
} else {
QString filename = m_fragmentShaderFile.fileName();
writeToFile(fragShader.serialized(), filename, FileType::Binary);
resetEffectError(ErrorFrag);
}
if (vertShader.isValid() && fragShader.isValid()) {
Q_EMIT shadersBaked();
setShadersUpToDate(true);
}
// TODO: Mark shaders as baked, required by export later
} }
bool EffectMakerModel::shadersUpToDate() const bool EffectMakerModel::shadersUpToDate() const

View File

@@ -8,6 +8,7 @@
#include <QMap> #include <QMap>
#include <QRegularExpression> #include <QRegularExpression>
#include <QStandardItemModel> #include <QStandardItemModel>
#include <QTemporaryFile>
#include <QtShaderTools/private/qshaderbaker_p.h> #include <QtShaderTools/private/qshaderbaker_p.h>
@@ -65,6 +66,7 @@ signals:
void selectedIndexChanged(int idx); void selectedIndexChanged(int idx);
void effectErrorChanged(); void effectErrorChanged();
void shadersUpToDateChanged(); void shadersUpToDateChanged();
void shadersBaked();
private: private:
enum Roles { enum Roles {
@@ -90,6 +92,7 @@ private:
const QString getVSUniforms(); const QString getVSUniforms();
const QString getFSUniforms(); const QString getFSUniforms();
void updateBakedShaderVersions();
QString detectErrorMessage(const QString &errorMessage); QString detectErrorMessage(const QString &errorMessage);
EffectError effectError() const; EffectError effectError() const;
void setEffectError(const QString &errorMessage, int type = -1, int lineNumber = -1); void setEffectError(const QString &errorMessage, int type = -1, int lineNumber = -1);
@@ -128,6 +131,8 @@ private:
QStringList m_defaultRootVertexShader; QStringList m_defaultRootVertexShader;
QStringList m_defaultRootFragmentShader; QStringList m_defaultRootFragmentShader;
QShaderBaker m_baker; QShaderBaker m_baker;
QTemporaryFile m_fragmentShaderFile;
QTemporaryFile m_vertexShaderFile;
// Used in exported QML, at root of the file // Used in exported QML, at root of the file
QString m_exportedRootPropertiesString; QString m_exportedRootPropertiesString;
// Used in exported QML, at ShaderEffect component of the file // Used in exported QML, at ShaderEffect component of the file