summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/render/backend/handle_types_p.h4
-rw-r--r--src/render/backend/jobs/renderviewjobutils.cpp10
-rw-r--r--src/render/backend/jobs/renderviewjobutils_p.h8
-rw-r--r--src/render/backend/managers_p.h6
-rw-r--r--src/render/backend/material.cpp2
-rw-r--r--src/render/backend/material_p.h2
-rw-r--r--src/render/backend/qrenderaspect.cpp2
-rw-r--r--src/render/backend/render-backend.pri8
-rw-r--r--src/render/backend/rendercommand_p.h2
-rw-r--r--src/render/backend/renderer.cpp2
-rw-r--r--src/render/backend/renderer_p.h4
-rw-r--r--src/render/backend/renderview.cpp2
-rw-r--r--src/render/backend/technique.cpp (renamed from src/render/backend/rendertechnique.cpp)28
-rw-r--r--src/render/backend/technique_p.h (renamed from src/render/backend/rendertechnique_p.h)12
14 files changed, 46 insertions, 46 deletions
diff --git a/src/render/backend/handle_types_p.h b/src/render/backend/handle_types_p.h
index eb6eae29a..da44b6813 100644
--- a/src/render/backend/handle_types_p.h
+++ b/src/render/backend/handle_types_p.h
@@ -61,7 +61,7 @@ class FrameGraphNode;
class Layer;
class Material;
class SortCriterion;
-class RenderTechnique;
+class Technique;
class RenderTexture;
class RenderTransform;
class RenderTarget;
@@ -87,7 +87,7 @@ typedef Qt3D::QHandle<Shader, 16> HShader;
typedef Qt3D::QHandle<QOpenGLVertexArrayObject*, 16> HVao;
typedef Qt3D::QHandle<Shader, 16> HShader;
typedef Qt3D::QHandle<SortCriterion, 8> HSortCriterion;
-typedef Qt3D::QHandle<RenderTechnique, 16> HTechnique;
+typedef Qt3D::QHandle<Technique, 16> HTechnique;
typedef Qt3D::QHandle<RenderTexture, 16> HTexture;
typedef Qt3D::QHandle<RenderTransform, 16> HTransform;
typedef Qt3D::QHandle<RenderTarget, 8> HTarget;
diff --git a/src/render/backend/jobs/renderviewjobutils.cpp b/src/render/backend/jobs/renderviewjobutils.cpp
index 89010c6ec..e5c455db0 100644
--- a/src/render/backend/jobs/renderviewjobutils.cpp
+++ b/src/render/backend/jobs/renderviewjobutils.cpp
@@ -207,10 +207,10 @@ void setRenderViewConfigFromFrameGraphLeafNode(RenderView *rv, const FrameGraphN
/*!
\internal
- Searches the \a renderer for the best matching RenderTechnique from
+ Searches the \a renderer for the best matching Technique from
\a effect specified by the \a renderView.
*/
-RenderTechnique *findTechniqueForEffect(Renderer *renderer,
+Technique *findTechniqueForEffect(Renderer *renderer,
RenderView *renderView,
Effect *effect)
{
@@ -219,7 +219,7 @@ RenderTechnique *findTechniqueForEffect(Renderer *renderer,
// Iterate through the techniques in the effect
Q_FOREACH (const QNodeId &techniqueId, effect->techniques()) {
- RenderTechnique *technique = renderer->techniqueManager()->lookupResource(techniqueId);
+ Technique *technique = renderer->techniqueManager()->lookupResource(techniqueId);
if (!technique)
continue;
@@ -270,7 +270,7 @@ RenderTechnique *findTechniqueForEffect(Renderer *renderer,
RenderRenderPassList findRenderPassesForTechnique(Renderer *renderer,
RenderView *renderView,
- RenderTechnique *technique)
+ Technique *technique)
{
Q_ASSERT(renderer);
Q_ASSERT(technique);
@@ -340,7 +340,7 @@ void parametersFromMaterialEffectTechnique(ParameterInfoList *infoList,
ParameterManager *manager,
Material *material,
Effect *effect,
- RenderTechnique *technique)
+ Technique *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 8179ebc85..3e362b39c 100644
--- a/src/render/backend/jobs/renderviewjobutils_p.h
+++ b/src/render/backend/jobs/renderviewjobutils_p.h
@@ -58,7 +58,7 @@ class Entity;
class Material;
class RenderPass;
class RenderStateSet;
-class RenderTechnique;
+class Technique;
class RenderView;
class Renderer;
class ShaderDataManager;
@@ -69,14 +69,14 @@ class RenderState;
Q_AUTOTEST_EXPORT void setRenderViewConfigFromFrameGraphLeafNode(RenderView *rv,
const FrameGraphNode *fgLeaf);
-Q_AUTOTEST_EXPORT RenderTechnique *findTechniqueForEffect(Renderer *renderer,
+Q_AUTOTEST_EXPORT Technique *findTechniqueForEffect(Renderer *renderer,
RenderView *renderView,
Effect *effect);
typedef QVarLengthArray<RenderPass*, 4> RenderRenderPassList;
Q_AUTOTEST_EXPORT RenderRenderPassList findRenderPassesForTechnique(Renderer *renderer,
RenderView *renderView,
- RenderTechnique *technique);
+ Technique *technique);
struct ParameterInfo
{
@@ -100,7 +100,7 @@ Q_AUTOTEST_EXPORT void parametersFromMaterialEffectTechnique(ParameterInfoList *
ParameterManager *manager,
Material *material,
Effect *effect,
- RenderTechnique *technique);
+ Technique *technique);
Q_AUTOTEST_EXPORT void addParametersForIds(ParameterInfoList *params, ParameterManager *manager,
const QList<Qt3D::QNodeId> &parameterIds);
diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h
index 70f119cca..ca54974f1 100644
--- a/src/render/backend/managers_p.h
+++ b/src/render/backend/managers_p.h
@@ -47,7 +47,7 @@
#include <Qt3DRenderer/private/material_p.h>
#include <Qt3DRenderer/private/shader_p.h>
#include <Qt3DRenderer/private/sortcriterion_p.h>
-#include <Qt3DRenderer/private/rendertechnique_p.h>
+#include <Qt3DRenderer/private/technique_p.h>
#include <Qt3DRenderer/private/rendertexture_p.h>
#include <Qt3DRenderer/private/rendertransform_p.h>
#include <Qt3DRenderer/private/rendertarget_p.h>
@@ -177,7 +177,7 @@ public:
};
class TechniqueManager : public Qt3D::QResourceManager<
- RenderTechnique,
+ Technique,
Qt3D::QNodeId,
16,
Qt3D::ArrayAllocatingPolicy,
@@ -310,7 +310,7 @@ Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Material, 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)
+Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Technique, Q_REQUIRES_CLEANUP)
Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderTexture, Q_REQUIRES_CLEANUP)
Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderPass, Q_REQUIRES_CLEANUP)
Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderTextureImage, Q_REQUIRES_CLEANUP)
diff --git a/src/render/backend/material.cpp b/src/render/backend/material.cpp
index d8f69c259..012b0eea3 100644
--- a/src/render/backend/material.cpp
+++ b/src/render/backend/material.cpp
@@ -36,7 +36,7 @@
#include "material_p.h"
#include "qgraphicscontext_p.h"
-#include "rendertechnique_p.h"
+#include "technique_p.h"
#include "effect_p.h"
#include "qparameter.h"
#include "qtechnique.h"
diff --git a/src/render/backend/material_p.h b/src/render/backend/material_p.h
index a440532f9..3c26a16e8 100644
--- a/src/render/backend/material_p.h
+++ b/src/render/backend/material_p.h
@@ -54,7 +54,7 @@ namespace Render {
class Renderer;
class QGraphicsContext;
-class RenderTechnique;
+class Technique;
class Effect;
class MaterialManager;
diff --git a/src/render/backend/qrenderaspect.cpp b/src/render/backend/qrenderaspect.cpp
index 78aaf6a9e..ad8253e97 100644
--- a/src/render/backend/qrenderaspect.cpp
+++ b/src/render/backend/qrenderaspect.cpp
@@ -204,7 +204,7 @@ void QRenderAspect::registerBackendTypes()
registerBackendType<Qt3D::QEntity>(QBackendNodeFunctorPtr(new Render::RenderEntityFunctor(d->m_renderer)));
registerBackendType<Qt3D::QTransform>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::RenderTransform, Render::TransformManager>(d->m_renderer->transformManager())));
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<QTechnique>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Technique, 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::Shader, Render::ShaderManager>(d->m_renderer->shaderManager())));
registerBackendType<QEffect>(QBackendNodeFunctorPtr(new Render::NodeFunctor<Render::Effect, Render::EffectManager>(d->m_renderer->effectManager())));
diff --git a/src/render/backend/render-backend.pri b/src/render/backend/render-backend.pri
index cf398314b..b496b6320 100644
--- a/src/render/backend/render-backend.pri
+++ b/src/render/backend/render-backend.pri
@@ -10,7 +10,6 @@ HEADERS += \
$$PWD/renderconfiguration_p.h \
$$PWD/renderer_p.h \
$$PWD/qgraphicscontext_p.h \
- $$PWD/rendertechnique_p.h \
$$PWD/quniformvalue_p.h \
$$PWD/rendertexture_p.h \
$$PWD/states/blendstate_p.h \
@@ -61,7 +60,8 @@ HEADERS += \
$$PWD/renderpass_p.h \
$$PWD/scene_p.h \
$$PWD/shaderdata_p.h \
- $$PWD/shader_p.h
+ $$PWD/shader_p.h \
+ $$PWD/technique_p.h
SOURCES += \
$$PWD/qrenderaspect.cpp \
@@ -69,7 +69,6 @@ SOURCES += \
$$PWD/renderconfiguration.cpp \
$$PWD/renderer.cpp \
$$PWD/qgraphicscontext.cpp \
- $$PWD/rendertechnique.cpp \
$$PWD/quniformvalue.cpp \
$$PWD/rendertexture.cpp \
$$PWD/states/blendstate.cpp \
@@ -110,4 +109,5 @@ SOURCES += \
$$PWD/renderpass.cpp \
$$PWD/scene.cpp \
$$PWD/shaderdata.cpp \
- $$PWD/shader.cpp
+ $$PWD/shader.cpp \
+ $$PWD/technique.cpp
diff --git a/src/render/backend/rendercommand_p.h b/src/render/backend/rendercommand_p.h
index 827b08fe9..e123d9be9 100644
--- a/src/render/backend/rendercommand_p.h
+++ b/src/render/backend/rendercommand_p.h
@@ -71,7 +71,7 @@ public:
HGeometryRenderer m_geometryRenderer;
// A QAttribute pack might be interesting
- // This is a temporary fix in the meantime, to remove the hacked methods in RenderTechnique
+ // This is a temporary fix in the meantime, to remove the hacked methods in Technique
QHash<QString, QString> m_parameterAttributeToShaderNames;
float m_depth;
diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp
index 64249e5c8..ab95575c1 100644
--- a/src/render/backend/renderer.cpp
+++ b/src/render/backend/renderer.cpp
@@ -63,7 +63,7 @@
#include <Qt3DRenderer/private/renderqueue_p.h>
#include <Qt3DRenderer/private/shader_p.h>
#include <Qt3DRenderer/private/renderstate_p.h>
-#include <Qt3DRenderer/private/rendertechnique_p.h>
+#include <Qt3DRenderer/private/technique_p.h>
#include <Qt3DRenderer/private/renderthread_p.h>
#include <Qt3DRenderer/private/renderview_p.h>
#include <Qt3DRenderer/private/techniquefilternode_p.h>
diff --git a/src/render/backend/renderer_p.h b/src/render/backend/renderer_p.h
index 97100283d..2eccbb922 100644
--- a/src/render/backend/renderer_p.h
+++ b/src/render/backend/renderer_p.h
@@ -85,7 +85,7 @@ class CameraLens;
class QGraphicsContext;
class FrameGraphNode;
class Material;
-class RenderTechnique;
+class Technique;
class Shader;
class Entity;
class RenderCommand;
@@ -219,7 +219,7 @@ private:
Entity *m_renderSceneRoot;
QHash<QMaterial*, Material*> m_materialHash;
- QHash<QTechnique *, RenderTechnique*> m_techniqueHash;
+ QHash<QTechnique *, Technique*> m_techniqueHash;
QHash<QShaderProgram*, Shader*> m_shaderHash;
QMaterial* m_defaultMaterial;
diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp
index 9b5694f60..19688ffd3 100644
--- a/src/render/backend/renderview.cpp
+++ b/src/render/backend/renderview.cpp
@@ -384,7 +384,7 @@ void RenderView::buildRenderCommands(Entity *node)
Effect *effect = Q_NULLPTR;
if ((material = node->renderComponent<Material>()) != Q_NULLPTR && material->isEnabled())
effect = m_renderer->effectManager()->lookupResource(material->effect());
- RenderTechnique *technique = findTechniqueForEffect(m_renderer, this, effect);
+ Technique *technique = findTechniqueForEffect(m_renderer, this, effect);
ParameterInfoList parameters;
// Order set:
diff --git a/src/render/backend/rendertechnique.cpp b/src/render/backend/technique.cpp
index 7489932e0..a3315f30e 100644
--- a/src/render/backend/rendertechnique.cpp
+++ b/src/render/backend/technique.cpp
@@ -34,7 +34,7 @@
**
****************************************************************************/
-#include "rendertechnique_p.h"
+#include "technique_p.h"
#include <Qt3DRenderer/qrenderpass.h>
#include <Qt3DRenderer/qparameter.h>
@@ -56,23 +56,23 @@ using namespace Qt3D;
namespace Qt3DRender {
namespace Render {
-RenderTechnique::RenderTechnique()
+Technique::Technique()
: QBackendNode()
, m_openglFilter(new QOpenGLFilter())
{
}
-RenderTechnique::~RenderTechnique()
+Technique::~Technique()
{
cleanup();
delete m_openglFilter;
}
-void RenderTechnique::cleanup()
+void Technique::cleanup()
{
}
-void RenderTechnique::updateFromPeer(Qt3D::QNode *peer)
+void Technique::updateFromPeer(Qt3D::QNode *peer)
{
m_parameterPack.clear();
m_renderPasses.clear();
@@ -94,7 +94,7 @@ void RenderTechnique::updateFromPeer(Qt3D::QNode *peer)
}
}
-void RenderTechnique::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void Technique::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
{
QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
switch (e->type()) {
@@ -141,44 +141,44 @@ void RenderTechnique::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
}
}
-QList<Qt3D::QNodeId> RenderTechnique::parameters() const
+QList<Qt3D::QNodeId> Technique::parameters() const
{
return m_parameterPack.parameters();
}
-void RenderTechnique::appendRenderPass(const Qt3D::QNodeId &renderPassId)
+void Technique::appendRenderPass(const Qt3D::QNodeId &renderPassId)
{
if (!m_renderPasses.contains(renderPassId))
m_renderPasses.append(renderPassId);
}
-void RenderTechnique::removeRenderPass(const Qt3D::QNodeId &renderPassId)
+void Technique::removeRenderPass(const Qt3D::QNodeId &renderPassId)
{
m_renderPasses.removeOne(renderPassId);
}
-QList<Qt3D::QNodeId> RenderTechnique::annotations() const
+QList<Qt3D::QNodeId> Technique::annotations() const
{
return m_annotationList;
}
-QList<Qt3D::QNodeId> RenderTechnique::renderPasses() const
+QList<Qt3D::QNodeId> Technique::renderPasses() const
{
return m_renderPasses;
}
-QOpenGLFilter *RenderTechnique::openGLFilter() const
+QOpenGLFilter *Technique::openGLFilter() const
{
return m_openglFilter;
}
-void RenderTechnique::appendAnnotation(const Qt3D::QNodeId &criterionId)
+void Technique::appendAnnotation(const Qt3D::QNodeId &criterionId)
{
if (!m_annotationList.contains(criterionId))
m_annotationList.append(criterionId);
}
-void RenderTechnique::removeAnnotation(const Qt3D::QNodeId &criterionId)
+void Technique::removeAnnotation(const Qt3D::QNodeId &criterionId)
{
m_annotationList.removeOne(criterionId);
}
diff --git a/src/render/backend/rendertechnique_p.h b/src/render/backend/technique_p.h
index 04fdb3180..dbebe7fc9 100644
--- a/src/render/backend/rendertechnique_p.h
+++ b/src/render/backend/technique_p.h
@@ -35,8 +35,8 @@
**
****************************************************************************/
-#ifndef QT3DRENDER_RENDER_RENDERTECHNIQUE_H
-#define QT3DRENDER_RENDER_RENDERTECHNIQUE_H
+#ifndef QT3DRENDER_RENDER_TECHNIQUE_H
+#define QT3DRENDER_RENDER_TECHNIQUE_H
#include <QVector>
#include <QStringList>
@@ -58,11 +58,11 @@ namespace Render {
class TechniqueManager;
-class RenderTechnique : public Qt3D::QBackendNode
+class Technique : public Qt3D::QBackendNode
{
public:
- RenderTechnique();
- ~RenderTechnique();
+ Technique();
+ ~Technique();
void cleanup();
void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
@@ -93,4 +93,4 @@ private:
QT_END_NAMESPACE
-#endif // QT3DRENDER_RENDER_RENDERTECHNIQUE_H
+#endif // QT3DRENDER_RENDER_TECHNIQUE_H
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 16:30:29 +0000