diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-09-13 16:58:33 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-10-13 08:55:22 +0000 |
| commit | b11095c58eca857dd8cc0b9ffcf0e4e6d6b5d555 (patch) | |
| tree | fed7ebac70b7842d13cc660ab380619d0b52ee41 /src/render/backend/jobs | |
| parent | 97ead2ac459516699f88cc6679c700fad4a090d1 (diff) | |
Rename RenderEffect -> Effect
Change-Id: I0c30308a609c3530119c99fe99c47782bde0c444
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/backend/jobs')
| -rw-r--r-- | src/render/backend/jobs/renderviewjobutils.cpp | 6 | ||||
| -rw-r--r-- | src/render/backend/jobs/renderviewjobutils_p.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/render/backend/jobs/renderviewjobutils.cpp b/src/render/backend/jobs/renderviewjobutils.cpp index 852d40d08..f70f7f224 100644 --- a/src/render/backend/jobs/renderviewjobutils.cpp +++ b/src/render/backend/jobs/renderviewjobutils.cpp @@ -45,7 +45,7 @@ #include <Qt3DRenderer/private/clearbuffer_p.h> #include <Qt3DRenderer/private/layerfilternode_p.h> #include <Qt3DRenderer/private/managers_p.h> -#include <Qt3DRenderer/private/rendereffect_p.h> +#include <Qt3DRenderer/private/effect_p.h> #include <Qt3DRenderer/private/renderpassfilternode_p.h> #include <Qt3DRenderer/private/renderstate_p.h> #include <Qt3DRenderer/private/rendertargetselectornode_p.h> @@ -212,7 +212,7 @@ void setRenderViewConfigFromFrameGraphLeafNode(RenderView *rv, const FrameGraphN */ RenderTechnique *findTechniqueForEffect(Renderer *renderer, RenderView *renderView, - RenderEffect *effect) + Effect *effect) { if (!effect) return Q_NULLPTR; @@ -339,7 +339,7 @@ void addParametersForIds(ParameterInfoList *params, ParameterManager *manager, void parametersFromMaterialEffectTechnique(ParameterInfoList *infoList, ParameterManager *manager, RenderMaterial *material, - RenderEffect *effect, + Effect *effect, RenderTechnique *technique) { // The parameters are taken in the following priority order: diff --git a/src/render/backend/jobs/renderviewjobutils_p.h b/src/render/backend/jobs/renderviewjobutils_p.h index 78ba67ff3..3bcedaba5 100644 --- a/src/render/backend/jobs/renderviewjobutils_p.h +++ b/src/render/backend/jobs/renderviewjobutils_p.h @@ -53,7 +53,7 @@ namespace Render { class FrameGraphNode; class ParameterManager; -class RenderEffect; +class Effect; class RenderEntity; class RenderMaterial; class RenderRenderPass; @@ -71,7 +71,7 @@ Q_AUTOTEST_EXPORT void setRenderViewConfigFromFrameGraphLeafNode(RenderView *rv, Q_AUTOTEST_EXPORT RenderTechnique *findTechniqueForEffect(Renderer *renderer, RenderView *renderView, - RenderEffect *effect); + Effect *effect); typedef QVarLengthArray<RenderRenderPass*, 4> RenderRenderPassList; Q_AUTOTEST_EXPORT RenderRenderPassList findRenderPassesForTechnique(Renderer *renderer, @@ -99,7 +99,7 @@ typedef QVarLengthArray<ParameterInfo, 16> ParameterInfoList; Q_AUTOTEST_EXPORT void parametersFromMaterialEffectTechnique(ParameterInfoList *infoList, ParameterManager *manager, RenderMaterial *material, - RenderEffect *effect, + Effect *effect, RenderTechnique *technique); Q_AUTOTEST_EXPORT void addParametersForIds(ParameterInfoList *params, ParameterManager *manager, |