diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-20 10:39:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-20 10:39:32 +0200 |
| commit | 0e3d54f8d7f9be26687afebcc9f456e4cefc2357 (patch) | |
| tree | f3826c927305cc137006aed968be6fbf57b42009 /src/render/jobs/renderviewjobutils_p.h | |
| parent | 52121396c55e6100316f006c87b4fdaa8b5a0719 (diff) | |
| parent | 7e638edbd15640302516f9a69d20f62d26d4af06 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/render/framegraph/qrendersurfaceselector.cpp
src/render/frontend/qrendersettings.cpp
src/render/jobs/renderviewjobutils_p.h
tests/auto/render/render.pro
Change-Id: Ibe9eb962e3990e07f01a5608a2d60c79bc4c160f
Diffstat (limited to 'src/render/jobs/renderviewjobutils_p.h')
| -rw-r--r-- | src/render/jobs/renderviewjobutils_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/render/jobs/renderviewjobutils_p.h b/src/render/jobs/renderviewjobutils_p.h index df4753980..c08083494 100644 --- a/src/render/jobs/renderviewjobutils_p.h +++ b/src/render/jobs/renderviewjobutils_p.h @@ -55,6 +55,7 @@ #include <Qt3DCore/qnodeid.h> #include <QtCore/qhash.h> #include <QtCore/qvariant.h> +#include <QMatrix4x4> #include <Qt3DRender/private/uniform_p.h> QT_BEGIN_NAMESPACE @@ -158,7 +159,8 @@ struct Q_AUTOTEST_EXPORT UniformBlockValueBuilder UniformBlockValueBuilder(); ~UniformBlockValueBuilder(); - void buildActiveUniformNameValueMapHelper(const QString &blockName, + void buildActiveUniformNameValueMapHelper(ShaderData *currentShaderData, + const QString &blockName, const QString &qmlPropertyName, const QVariant &value); void buildActiveUniformNameValueMapStructHelper(ShaderData *rShaderData, @@ -169,6 +171,7 @@ struct Q_AUTOTEST_EXPORT UniformBlockValueBuilder QHash<QString, ShaderUniform> uniforms; UniformBlockValueBuilderHash activeUniformNamesToValue; ShaderDataManager *shaderDataManager; + QMatrix4x4 viewMatrix; }; } // namespace Render |