Migrate NormalDiffuseSpecularMapMaterial to be light-aware

Remove duplicated vertex shaders in the process.
[normal]diffusespecularmap.vert is the same as [normal]diffusemap.vert
hence there is no need for the former.

Change-Id: If448005c593c765551ca239af6789df2f6e53af6
Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml
index 919805a2e..1684af789 100644
--- a/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml
+++ b/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml
@@ -84,13 +84,13 @@ Material {
     effect: Effect {
         ShaderProgram {
             id: gl2Es2Shader
-            vertexShaderCode:   loadSource("qrc:/shaders/es2/diffusespecularmap.vert")
+            vertexShaderCode:   loadSource("qrc:/shaders/es2/diffusemap.vert")
             fragmentShaderCode: loadSource("qrc:/shaders/es2/diffusespecularmap.frag")
         }
 
         ShaderProgram {
             id: gl3Shader
-            vertexShaderCode:   loadSource("qrc:/shaders/gl3/diffusespecularmap.vert")
+            vertexShaderCode:   loadSource("qrc:/shaders/gl3/diffusemap.vert")
             fragmentShaderCode: loadSource("qrc:/shaders/gl3/diffusespecularmap.frag")
         }