diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2020-08-10 12:32:37 +0200 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2020-08-11 12:57:19 +0200 |
commit | a90c52c9ba1a5a7a9ef5bd4d1da4f7e08787c372 (patch) | |
tree | 62f3a51540013098210d2a33112b690f04e9ea27 /src/extras/defaults/qnormaldiffusemapmaterial.cpp | |
parent | 1b63d866c6e8d157c5034af4bfd1caa996487f18 (diff) |
rhi: Qt3DExtras has different combinations of default.vert
So that we only define the vertex attributes we require which avoids
conflicts with Metal and Vulkan.
Change-Id: I72155996719e27b5667e055d44024250a2596025
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/extras/defaults/qnormaldiffusemapmaterial.cpp')
-rw-r--r-- | src/extras/defaults/qnormaldiffusemapmaterial.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/extras/defaults/qnormaldiffusemapmaterial.cpp b/src/extras/defaults/qnormaldiffusemapmaterial.cpp index c4f3e15b2..95e031233 100644 --- a/src/extras/defaults/qnormaldiffusemapmaterial.cpp +++ b/src/extras/defaults/qnormaldiffusemapmaterial.cpp @@ -132,7 +132,7 @@ void QNormalDiffuseMapMaterialPrivate::init() QStringLiteral("specular"), QStringLiteral("normalTexture")}); - m_normalDiffuseRHIShader->setVertexShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/rhi/default.vert")))); + m_normalDiffuseRHIShader->setVertexShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/rhi/default_pos_norm_tex_tan.vert")))); m_normalDiffuseRHIShaderBuilder->setParent(q); m_normalDiffuseRHIShaderBuilder->setShaderProgram(m_normalDiffuseRHIShader); m_normalDiffuseRHIShaderBuilder->setFragmentShaderGraph(QUrl(QStringLiteral("qrc:/shaders/graphs/phong.frag.json"))); |