diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-09-18 10:58:19 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2015-10-13 12:12:30 +0000 |
| commit | 84ca9536545f182bc098ef19dbfda472c6a5ae35 (patch) | |
| tree | c025603df1cd2f696a077f10ec7cc625186aefd0 /src/render/backend/qrenderaspect.cpp | |
| parent | beb770c05f6fc037ddd49c08d706d29b935bd40d (diff) | |
Rename RenderShader -> Shader
Change-Id: Iafdfc44bdc97c53974a2d47834a61914be06ac25
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/backend/qrenderaspect.cpp')
| -rw-r--r-- | src/render/backend/qrenderaspect.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/backend/qrenderaspect.cpp b/src/render/backend/qrenderaspect.cpp index dee284176..78aaf6a9e 100644 --- a/src/render/backend/qrenderaspect.cpp +++ b/src/render/backend/qrenderaspect.cpp @@ -206,7 +206,7 @@ void QRenderAspect::registerBackendTypes() registerBackendType<QMaterial>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Material, Render::MaterialManager>(d->m_renderer->materialManager()))); registerBackendType<QTechnique>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::RenderTechnique, Render::TechniqueManager>(d->m_renderer->techniqueManager()))); registerBackendType<QAbstractTextureProvider>(QBackendNodeFunctorPtr(new Render::RenderTextureFunctor(d->m_renderer->textureManager(), d->m_renderer->textureImageManager(), d->m_renderer->textureDataManager()))); - registerBackendType<QShaderProgram>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::RenderShader, Render::ShaderManager>(d->m_renderer->shaderManager()))); + registerBackendType<QShaderProgram>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Shader, Render::ShaderManager>(d->m_renderer->shaderManager()))); registerBackendType<QEffect>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Effect, Render::EffectManager>(d->m_renderer->effectManager()))); registerBackendType<QAnnotation>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Annotation, Render::CriterionManager>(d->m_renderer->criterionManager()))); registerBackendType<Qt3D::QCameraLens>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::CameraLens, Render::CameraManager>(d->m_renderer->cameraManager()))); |