From a90c52c9ba1a5a7a9ef5bd4d1da4f7e08787c372 Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Mon, 10 Aug 2020 12:32:37 +0200 Subject: 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 --- src/extras/defaults/qnormaldiffusemapmaterial.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/extras/defaults/qnormaldiffusemapmaterial.cpp') 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"))); -- cgit v1.2.3