summaryrefslogtreecommitdiffstats
path: root/src/render/backend
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@theqtcompany.com>2015-11-30 18:03:01 +0100
committerLaszlo Agocs <laszlo.agocs@theqtcompany.com>2015-12-01 14:05:34 +0000
commitf6adee1f24a148a0daafb37a33f9da16095875b4 (patch)
treecf5a540e5c4ce8acde86430662c389213a6acf61 /src/render/backend
parentc7125de64509411644b7b5ab185ebec40bfa77c3 (diff)
Unify the default and phong shaders
This also means that (Q)PhongMaterial is now lights capable. Change-Id: I8191fa6dfe96dadafdc9a2db47066650a8c96ee6 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/backend')
-rw-r--r--src/render/backend/renderer.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp
index 4c70f22a3..989c4ec00 100644
--- a/src/render/backend/renderer.cpp
+++ b/src/render/backend/renderer.cpp
@@ -181,15 +181,15 @@ void Renderer::buildDefaultTechnique()
QString vertexFileName;
QString fragmentFileName;
if (m_graphicsContext->openGLContext()->isOpenGLES()) {
- vertexFileName = QStringLiteral("qrc:/shaders/es2/default.vert");
- fragmentFileName = QStringLiteral("qrc:/shaders/es2/default.frag");
+ vertexFileName = QStringLiteral("qrc:/shaders/es2/phong.vert");
+ fragmentFileName = QStringLiteral("qrc:/shaders/es2/phong.frag");
} else {
if (m_graphicsContext->openGLContext()->format().profile() == QSurfaceFormat::CoreProfile) {
- vertexFileName = QStringLiteral("qrc:/shaders/gl3/default.vert");
- fragmentFileName = QStringLiteral("qrc:/shaders/gl3/default.frag");
+ vertexFileName = QStringLiteral("qrc:/shaders/gl3/phong.vert");
+ fragmentFileName = QStringLiteral("qrc:/shaders/gl3/phong.frag");
} else {
- vertexFileName = QStringLiteral("qrc:/shaders/es2/default.vert");
- fragmentFileName = QStringLiteral("qrc:/shaders/es2/default.frag");
+ vertexFileName = QStringLiteral("qrc:/shaders/es2/phong.vert");
+ fragmentFileName = QStringLiteral("qrc:/shaders/es2/phong.frag");
}
}
defaultShader->setVertexShaderCode(QShaderProgram::loadSource(QUrl(vertexFileName)));