rhi: Port most of Qt3DExtras materials to RHI

Change-Id: Iba20f047404b20c1e5b9bdcef917b3c2a1000d59
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

1 files changed, 20 insertions, 0 deletions

diff --git a/src/extras/defaults/qnormaldiffusemapmaterial.cpp b/src/extras/defaults/qnormaldiffusemapmaterial.cpp
index 9d41ddb32..c4f3e15b2 100644
--- a/src/extras/defaults/qnormaldiffusemapmaterial.cpp
+++ b/src/extras/defaults/qnormaldiffusemapmaterial.cpp
@@ -73,13 +73,17 @@ QNormalDiffuseMapMaterialPrivate::QNormalDiffuseMapMaterialPrivate()
     , m_normalDiffuseGL3Technique(new QTechnique())
     , m_normalDiffuseGL2Technique(new QTechnique())
     , m_normalDiffuseES2Technique(new QTechnique())
+    , m_normalDiffuseRHITechnique(new QTechnique())
     , m_normalDiffuseGL3RenderPass(new QRenderPass())
     , m_normalDiffuseGL2RenderPass(new QRenderPass())
     , m_normalDiffuseES2RenderPass(new QRenderPass())
+    , m_normalDiffuseRHIRenderPass(new QRenderPass())
     , m_normalDiffuseGL3Shader(new QShaderProgram())
     , m_normalDiffuseGL3ShaderBuilder(new QShaderProgramBuilder())
     , m_normalDiffuseGL2ES2Shader(new QShaderProgram())
     , m_normalDiffuseGL2ES2ShaderBuilder(new QShaderProgramBuilder())
+    , m_normalDiffuseRHIShader(new QShaderProgram())
+    , m_normalDiffuseRHIShaderBuilder(new QShaderProgramBuilder())
     , m_filterKey(new QFilterKey)
 {
     m_diffuseTexture->setMagnificationFilter(QAbstractTexture::Linear);
@@ -128,6 +132,14 @@ void QNormalDiffuseMapMaterialPrivate::init()
                                                           QStringLiteral("specular"),
                                                           QStringLiteral("normalTexture")});
 
+    m_normalDiffuseRHIShader->setVertexShaderCode(QShaderProgram::loadSource(QUrl(QStringLiteral("qrc:/shaders/rhi/default.vert"))));
+    m_normalDiffuseRHIShaderBuilder->setParent(q);
+    m_normalDiffuseRHIShaderBuilder->setShaderProgram(m_normalDiffuseRHIShader);
+    m_normalDiffuseRHIShaderBuilder->setFragmentShaderGraph(QUrl(QStringLiteral("qrc:/shaders/graphs/phong.frag.json")));
+    m_normalDiffuseRHIShaderBuilder->setEnabledLayers({QStringLiteral("diffuseTexture"),
+                                                       QStringLiteral("specular"),
+                                                       QStringLiteral("normalTexture")});
+
     m_normalDiffuseGL3Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL);
     m_normalDiffuseGL3Technique->graphicsApiFilter()->setMajorVersion(3);
     m_normalDiffuseGL3Technique->graphicsApiFilter()->setMinorVersion(1);
@@ -143,6 +155,10 @@ void QNormalDiffuseMapMaterialPrivate::init()
     m_normalDiffuseES2Technique->graphicsApiFilter()->setMinorVersion(0);
     m_normalDiffuseES2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile);
 
+    m_normalDiffuseRHITechnique->graphicsApiFilter()->setApi(QGraphicsApiFilter::RHI);
+    m_normalDiffuseRHITechnique->graphicsApiFilter()->setMajorVersion(1);
+    m_normalDiffuseRHITechnique->graphicsApiFilter()->setMinorVersion(0);
+
     m_filterKey->setParent(q);
     m_filterKey->setName(QStringLiteral("renderingStyle"));
     m_filterKey->setValue(QStringLiteral("forward"));
@@ -150,18 +166,22 @@ void QNormalDiffuseMapMaterialPrivate::init()
     m_normalDiffuseGL3Technique->addFilterKey(m_filterKey);
     m_normalDiffuseGL2Technique->addFilterKey(m_filterKey);
     m_normalDiffuseES2Technique->addFilterKey(m_filterKey);
+    m_normalDiffuseRHITechnique->addFilterKey(m_filterKey);
 
     m_normalDiffuseGL3RenderPass->setShaderProgram(m_normalDiffuseGL3Shader);
     m_normalDiffuseGL2RenderPass->setShaderProgram(m_normalDiffuseGL2ES2Shader);
     m_normalDiffuseES2RenderPass->setShaderProgram(m_normalDiffuseGL2ES2Shader);
+    m_normalDiffuseRHIRenderPass->setShaderProgram(m_normalDiffuseRHIShader);
 
     m_normalDiffuseGL3Technique->addRenderPass(m_normalDiffuseGL3RenderPass);
     m_normalDiffuseGL2Technique->addRenderPass(m_normalDiffuseGL2RenderPass);
     m_normalDiffuseES2Technique->addRenderPass(m_normalDiffuseES2RenderPass);
+    m_normalDiffuseRHITechnique->addRenderPass(m_normalDiffuseRHIRenderPass);
 
     m_normalDiffuseEffect->addTechnique(m_normalDiffuseGL3Technique);
     m_normalDiffuseEffect->addTechnique(m_normalDiffuseGL2Technique);
     m_normalDiffuseEffect->addTechnique(m_normalDiffuseES2Technique);
+    m_normalDiffuseEffect->addTechnique(m_normalDiffuseRHITechnique);
 
     m_normalDiffuseEffect->addParameter(m_ambientParameter);
     m_normalDiffuseEffect->addParameter(m_diffuseParameter);