diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-09-18 08:15:03 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2015-10-13 10:18:35 +0000 |
| commit | 96d504427e94bb45427a8afb0adbc44d64573ca9 (patch) | |
| tree | 1c3b1d5ec79fb84431b21a11873ccae6dded715c /src/render/backend/jobs | |
| parent | 7e090adf359aea25722b62e2e4f604af0fa78bf5 (diff) | |
Rename RenderMaterial -> Material
Change-Id: I4fed4482fe3620caed638f36a054db374a8e8942
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/backend/jobs')
| -rw-r--r-- | src/render/backend/jobs/renderviewjobutils.cpp | 2 | ||||
| -rw-r--r-- | src/render/backend/jobs/renderviewjobutils_p.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/render/backend/jobs/renderviewjobutils.cpp b/src/render/backend/jobs/renderviewjobutils.cpp index 4a886cfd9..7ed58ce5b 100644 --- a/src/render/backend/jobs/renderviewjobutils.cpp +++ b/src/render/backend/jobs/renderviewjobutils.cpp @@ -338,7 +338,7 @@ void addParametersForIds(ParameterInfoList *params, ParameterManager *manager, void parametersFromMaterialEffectTechnique(ParameterInfoList *infoList, ParameterManager *manager, - RenderMaterial *material, + Material *material, Effect *effect, RenderTechnique *technique) { diff --git a/src/render/backend/jobs/renderviewjobutils_p.h b/src/render/backend/jobs/renderviewjobutils_p.h index 7d625c3e3..7435bcc57 100644 --- a/src/render/backend/jobs/renderviewjobutils_p.h +++ b/src/render/backend/jobs/renderviewjobutils_p.h @@ -55,7 +55,7 @@ class FrameGraphNode; class ParameterManager; class Effect; class Entity; -class RenderMaterial; +class Material; class RenderRenderPass; class RenderStateSet; class RenderTechnique; @@ -98,7 +98,7 @@ typedef QVarLengthArray<ParameterInfo, 16> ParameterInfoList; Q_AUTOTEST_EXPORT void parametersFromMaterialEffectTechnique(ParameterInfoList *infoList, ParameterManager *manager, - RenderMaterial *material, + Material *material, Effect *effect, RenderTechnique *technique); |