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/managers_p.h | |
| parent | beb770c05f6fc037ddd49c08d706d29b935bd40d (diff) | |
Rename RenderShader -> Shader
Change-Id: Iafdfc44bdc97c53974a2d47834a61914be06ac25
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/backend/managers_p.h')
| -rw-r--r-- | src/render/backend/managers_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h index 8fd33dbaa..70f119cca 100644 --- a/src/render/backend/managers_p.h +++ b/src/render/backend/managers_p.h @@ -45,7 +45,7 @@ #include <Qt3DRenderer/private/entity_p.h> #include <Qt3DRenderer/private/layer_p.h> #include <Qt3DRenderer/private/material_p.h> -#include <Qt3DRenderer/private/rendershader_p.h> +#include <Qt3DRenderer/private/shader_p.h> #include <Qt3DRenderer/private/sortcriterion_p.h> #include <Qt3DRenderer/private/rendertechnique_p.h> #include <Qt3DRenderer/private/rendertexture_p.h> @@ -155,7 +155,7 @@ public: }; class ShaderManager : public Qt3D::QResourceManager< - RenderShader, + Shader, Qt3D::QNodeId, 16, Qt3D::ArrayAllocatingPolicy, @@ -307,7 +307,7 @@ Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Effect, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Entity, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Layer, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Material, Q_REQUIRES_CLEANUP) -Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderShader, Q_REQUIRES_CLEANUP) +Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Shader, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::SortCriterion, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderTarget, Q_REQUIRES_CLEANUP) Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderTechnique, Q_REQUIRES_CLEANUP) |