summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/qt3d/bigscene-instanced-qml/main.qml6
-rw-r--r--examples/qt3d/clip-planes-qml/CappingMaterialEffect.qml6
-rw-r--r--examples/qt3d/clip-planes-qml/ClipMaterialEffect.qml6
-rw-r--r--examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml12
-rw-r--r--examples/qt3d/deferred-renderer-cpp/finaleffect.cpp18
-rw-r--r--examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp18
-rw-r--r--examples/qt3d/deferred-renderer-qml/FinalEffect.qml4
-rw-r--r--examples/qt3d/deferred-renderer-qml/SceneEffect.qml4
-rw-r--r--examples/qt3d/instanced-arrays-qml/main.qml6
-rw-r--r--examples/qt3d/planets-qml/CloudEffectDS.qml14
-rw-r--r--examples/qt3d/planets-qml/PlanetEffectD.qml14
-rw-r--r--examples/qt3d/planets-qml/PlanetEffectDB.qml14
-rw-r--r--examples/qt3d/planets-qml/PlanetEffectDSB.qml14
-rw-r--r--examples/qt3d/planets-qml/PlanetShadowEffectD.qml14
-rw-r--r--examples/qt3d/plasma/main.qml6
-rw-r--r--examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml2
-rw-r--r--examples/qt3d/playground-qml/ComplexTechnique.qml2
-rw-r--r--examples/qt3d/shadow-map-qml/AdsEffect.qml10
-rw-r--r--examples/qt3d/simple-shaders-qml/main.qml12
-rw-r--r--examples/qt3d/skybox/Skybox.qml18
-rw-r--r--examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml6
-rw-r--r--examples/qt3d/transparency-qml-scene3d/Scene.qml12
-rw-r--r--examples/qt3d/transparency-qml/main.qml12
-rw-r--r--examples/qt3d/wave/BackgroundEffect.qml6
-rw-r--r--examples/qt3d/wave/WaveEffect.qml6
-rw-r--r--examples/qt3d/wireframe/WireframeEffect.qml6
26 files changed, 124 insertions, 124 deletions
diff --git a/examples/qt3d/bigscene-instanced-qml/main.qml b/examples/qt3d/bigscene-instanced-qml/main.qml
index c1ff7ff2f..699e8d305 100644
--- a/examples/qt3d/bigscene-instanced-qml/main.qml
+++ b/examples/qt3d/bigscene-instanced-qml/main.qml
@@ -72,9 +72,9 @@ Entity {
id: instancedPhongMaterial
effect: Effect {
techniques: Technique {
- openGLFilter {
- api: OpenGLFilter.Desktop
- profile: OpenGLFilter.Core
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
+ profile: GraphicsApiFilter.CoreProfile
minorVersion: 2
majorVersion: 3
}
diff --git a/examples/qt3d/clip-planes-qml/CappingMaterialEffect.qml b/examples/qt3d/clip-planes-qml/CappingMaterialEffect.qml
index a50818be8..0be92543e 100644
--- a/examples/qt3d/clip-planes-qml/CappingMaterialEffect.qml
+++ b/examples/qt3d/clip-planes-qml/CappingMaterialEffect.qml
@@ -54,9 +54,9 @@ Effect {
techniques: [
Technique {
- openGLFilter {
- api: OpenGLFilter.Desktop
- profile: OpenGLFilter.None
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
+ profile: GraphicsApiFilter.NoProfile
majorVersion: 3
minorVersion: 2
}
diff --git a/examples/qt3d/clip-planes-qml/ClipMaterialEffect.qml b/examples/qt3d/clip-planes-qml/ClipMaterialEffect.qml
index 27468af8f..36305b4d2 100644
--- a/examples/qt3d/clip-planes-qml/ClipMaterialEffect.qml
+++ b/examples/qt3d/clip-planes-qml/ClipMaterialEffect.qml
@@ -53,9 +53,9 @@ Effect {
techniques: [
Technique {
- openGLFilter {
- api: OpenGLFilter.Desktop
- profile: OpenGLFilter.None
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
+ profile: GraphicsApiFilter.NoProfile
majorVersion: 3
minorVersion: 2
}
diff --git a/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml b/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml
index 78d5f478d..2694a8999 100644
--- a/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml
+++ b/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml
@@ -73,9 +73,9 @@ Material {
techniques: [
// GL 3 Technique
Technique {
- openGLFilter {
- api: OpenGLFilter.Desktop
- profile: OpenGLFilter.Core
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
+ profile: GraphicsApiFilter.CoreProfile
majorVersion: 3
minorVersion: 1
}
@@ -95,9 +95,9 @@ Material {
// GL 2 Technique
Technique {
- openGLFilter {
- api: OpenGLFilter.Desktop
- profile: OpenGLFilter.None
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
+ profile: GraphicsApiFilter.NoProfile
majorVersion: 2
minorVersion: 0
}
diff --git a/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
index fae61c78d..ebbcfa357 100644
--- a/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/finaleffect.cpp
@@ -36,7 +36,7 @@
#include "finaleffect.h"
-#include <Qt3DRender/QOpenGLFilter>
+#include <Qt3DRender/QGraphicsApiFilter>
#include <Qt3DRender/QShaderProgram>
#include <QUrl>
@@ -48,15 +48,15 @@ FinalEffect::FinalEffect(Qt3DCore::QNode *parent)
, m_gl3Pass(new Qt3DRender::QRenderPass())
, m_passCriterion(new Qt3DRender::QAnnotation(this))
{
- m_gl3Technique->openGLFilter()->setApi(Qt3DRender::QOpenGLFilter::Desktop);
- m_gl3Technique->openGLFilter()->setMajorVersion(3);
- m_gl3Technique->openGLFilter()->setMinorVersion(1);
- m_gl3Technique->openGLFilter()->setProfile(Qt3DRender::QOpenGLFilter::Core);
+ m_gl3Technique->graphicsApiFilter()->setApi(Qt3DRender::QGraphicsApiFilter::OpenGL);
+ m_gl3Technique->graphicsApiFilter()->setMajorVersion(3);
+ m_gl3Technique->graphicsApiFilter()->setMinorVersion(1);
+ m_gl3Technique->graphicsApiFilter()->setProfile(Qt3DRender::QGraphicsApiFilter::CoreProfile);
- m_gl2Technique->openGLFilter()->setApi(Qt3DRender::QOpenGLFilter::Desktop);
- m_gl2Technique->openGLFilter()->setMajorVersion(2);
- m_gl2Technique->openGLFilter()->setMinorVersion(0);
- m_gl2Technique->openGLFilter()->setProfile(Qt3DRender::QOpenGLFilter::None);
+ m_gl2Technique->graphicsApiFilter()->setApi(Qt3DRender::QGraphicsApiFilter::OpenGL);
+ m_gl2Technique->graphicsApiFilter()->setMajorVersion(2);
+ m_gl2Technique->graphicsApiFilter()->setMinorVersion(0);
+ m_gl2Technique->graphicsApiFilter()->setProfile(Qt3DRender::QGraphicsApiFilter::NoProfile);
m_passCriterion->setName(QStringLiteral("pass"));
m_passCriterion->setValue(QStringLiteral("final"));
diff --git a/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp b/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
index 64add3ef7..7ea21cc24 100644
--- a/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/sceneeffect.cpp
@@ -36,7 +36,7 @@
#include "sceneeffect.h"
-#include <Qt3DRender/QOpenGLFilter>
+#include <Qt3DRender/QGraphicsApiFilter>
#include <Qt3DRender/QShaderProgram>
#include <QUrl>
@@ -49,15 +49,15 @@ SceneEffect::SceneEffect(Qt3DCore::QNode *parent)
, m_passCriterion(new Qt3DRender::QAnnotation(this))
{
- m_gl3Technique->openGLFilter()->setProfile(Qt3DRender::QOpenGLFilter::None);
- m_gl3Technique->openGLFilter()->setApi(Qt3DRender::QOpenGLFilter::Desktop);
- m_gl3Technique->openGLFilter()->setMajorVersion(3);
- m_gl3Technique->openGLFilter()->setMinorVersion(3);
+ m_gl3Technique->graphicsApiFilter()->setProfile(Qt3DRender::QGraphicsApiFilter::NoProfile);
+ m_gl3Technique->graphicsApiFilter()->setApi(Qt3DRender::QGraphicsApiFilter::OpenGL);
+ m_gl3Technique->graphicsApiFilter()->setMajorVersion(3);
+ m_gl3Technique->graphicsApiFilter()->setMinorVersion(3);
- m_gl2Technique->openGLFilter()->setApi(Qt3DRender::QOpenGLFilter::Desktop);
- m_gl2Technique->openGLFilter()->setMajorVersion(2);
- m_gl2Technique->openGLFilter()->setMinorVersion(0);
- m_gl2Technique->openGLFilter()->setProfile(Qt3DRender::QOpenGLFilter::None);
+ m_gl2Technique->graphicsApiFilter()->setApi(Qt3DRender::QGraphicsApiFilter::OpenGL);
+ m_gl2Technique->graphicsApiFilter()->setMajorVersion(2);
+ m_gl2Technique->graphicsApiFilter()->setMinorVersion(0);
+ m_gl2Technique->graphicsApiFilter()->setProfile(Qt3DRender::QGraphicsApiFilter::NoProfile);
m_passCriterion->setName(QStringLiteral("pass"));
diff --git a/examples/qt3d/deferred-renderer-qml/FinalEffect.qml b/examples/qt3d/deferred-renderer-qml/FinalEffect.qml
index d754597c8..5acead772 100644
--- a/examples/qt3d/deferred-renderer-qml/FinalEffect.qml
+++ b/examples/qt3d/deferred-renderer-qml/FinalEffect.qml
@@ -41,7 +41,7 @@ Effect {
techniques : [
// OpenGL 3.1
Technique {
- openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.Core; minorVersion : 1; majorVersion : 3 }
+ graphicsApiFilter {api : GraphicsApiFilter.OpenGL; profile : GraphicsApiFilter.CoreProfile; minorVersion : 1; majorVersion : 3 }
parameters: Parameter { name: "PointLightBlock"; value: ShaderData {
property ShaderDataArray lights: ShaderDataArray {
// hard coded lights until we have a way to filter
@@ -109,7 +109,7 @@ Effect {
},
// OpenGL 2.0 with FBO extension
Technique {
- openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.None; minorVersion : 0; majorVersion : 2 }
+ graphicsApiFilter {api : GraphicsApiFilter.OpenGL; profile : GraphicsApiFilter.NoProfile; minorVersion : 0; majorVersion : 2 }
parameters: Parameter { name: "pointLights"; value: ShaderData {
property ShaderDataArray lights: ShaderDataArray {
// hard coded lights until we have a way to filter
diff --git a/examples/qt3d/deferred-renderer-qml/SceneEffect.qml b/examples/qt3d/deferred-renderer-qml/SceneEffect.qml
index 1e4e9f450..5dbc3ed9d 100644
--- a/examples/qt3d/deferred-renderer-qml/SceneEffect.qml
+++ b/examples/qt3d/deferred-renderer-qml/SceneEffect.qml
@@ -42,7 +42,7 @@ Effect {
techniques : [
// OpenGL 3.1
Technique {
- openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.Core; minorVersion : 1; majorVersion : 3 }
+ graphicsApiFilter {api : GraphicsApiFilter.OpenGL; profile : GraphicsApiFilter.CoreProfile; minorVersion : 1; majorVersion : 3 }
renderPasses : RenderPass {
annotations : Annotation { name : "pass"; value : "geometry" }
shaderProgram : ShaderProgram {
@@ -93,7 +93,7 @@ Effect {
},
// OpenGL 2.0
Technique {
- openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.Core; minorVersion : 0; majorVersion : 2 }
+ graphicsApiFilter {api : GraphicsApiFilter.OpenGL; profile : GraphicsApiFilter.CoreProfile; minorVersion : 0; majorVersion : 2 }
renderPasses : RenderPass {
annotations : Annotation { name : "pass"; value : "geometry" }
shaderProgram : ShaderProgram {
diff --git a/examples/qt3d/instanced-arrays-qml/main.qml b/examples/qt3d/instanced-arrays-qml/main.qml
index 7f944a8fe..c1bf01dda 100644
--- a/examples/qt3d/instanced-arrays-qml/main.qml
+++ b/examples/qt3d/instanced-arrays-qml/main.qml
@@ -70,9 +70,9 @@ Entity {
id: instancedPhongMaterial
effect: Effect {
techniques: Technique {
- openGLFilter {
- api: OpenGLFilter.Desktop
- profile: OpenGLFilter.Core
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
+ profile: GraphicsApiFilter.CoreProfile
minorVersion: 2
majorVersion: 3
}
diff --git a/examples/qt3d/planets-qml/CloudEffectDS.qml b/examples/qt3d/planets-qml/CloudEffectDS.qml
index 8d51440a6..836349c9b 100644
--- a/examples/qt3d/planets-qml/CloudEffectDS.qml
+++ b/examples/qt3d/planets-qml/CloudEffectDS.qml
@@ -51,9 +51,9 @@ Effect {
techniques: [
Technique {
- openGLFilter {
- api: OpenGLFilter.Desktop
- profile: OpenGLFilter.Core
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
+ profile: GraphicsApiFilter.CoreProfile
majorVersion: 3
minorVersion: 2
}
@@ -82,8 +82,8 @@ Effect {
]
},
Technique {
- openGLFilter {
- api: OpenGLFilter.Desktop
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
majorVersion: 2
}
@@ -112,8 +112,8 @@ Effect {
]
},
Technique {
- openGLFilter {
- api: OpenGLFilter.ES
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGLES
majorVersion: 2
minorVersion: 0
}
diff --git a/examples/qt3d/planets-qml/PlanetEffectD.qml b/examples/qt3d/planets-qml/PlanetEffectD.qml
index eb0ecd2ba..f054db69e 100644
--- a/examples/qt3d/planets-qml/PlanetEffectD.qml
+++ b/examples/qt3d/planets-qml/PlanetEffectD.qml
@@ -52,9 +52,9 @@ Effect {
techniques: [
Technique {
- openGLFilter {
- api: OpenGLFilter.Desktop
- profile: OpenGLFilter.Core
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
+ profile: GraphicsApiFilter.CoreProfile
majorVersion: 3
minorVersion: 2
}
@@ -89,8 +89,8 @@ Effect {
]
},
Technique {
- openGLFilter {
- api: OpenGLFilter.Desktop
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
majorVersion: 2
}
@@ -124,8 +124,8 @@ Effect {
]
},
Technique {
- openGLFilter {
- api: OpenGLFilter.ES
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGLES
majorVersion: 2
minorVersion: 0
}
diff --git a/examples/qt3d/planets-qml/PlanetEffectDB.qml b/examples/qt3d/planets-qml/PlanetEffectDB.qml
index 7c5c1931a..210a3390d 100644
--- a/examples/qt3d/planets-qml/PlanetEffectDB.qml
+++ b/examples/qt3d/planets-qml/PlanetEffectDB.qml
@@ -52,9 +52,9 @@ Effect {
techniques: [
Technique {
- openGLFilter {
- api: OpenGLFilter.Desktop
- profile: OpenGLFilter.Core
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
+ profile: GraphicsApiFilter.CoreProfile
majorVersion: 3
minorVersion: 2
}
@@ -89,8 +89,8 @@ Effect {
]
},
Technique {
- openGLFilter {
- api: OpenGLFilter.Desktop
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
majorVersion: 2
}
@@ -124,8 +124,8 @@ Effect {
]
},
Technique {
- openGLFilter {
- api: OpenGLFilter.ES
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGLES
majorVersion: 2
minorVersion: 0
}
diff --git a/examples/qt3d/planets-qml/PlanetEffectDSB.qml b/examples/qt3d/planets-qml/PlanetEffectDSB.qml
index e3f6a39c0..3e9e231bb 100644
--- a/examples/qt3d/planets-qml/PlanetEffectDSB.qml
+++ b/examples/qt3d/planets-qml/PlanetEffectDSB.qml
@@ -52,9 +52,9 @@ Effect {
techniques: [
Technique {
- openGLFilter {
- api: OpenGLFilter.Desktop
- profile: OpenGLFilter.Core
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
+ profile: GraphicsApiFilter.CoreProfile
majorVersion: 3
minorVersion: 2
}
@@ -84,8 +84,8 @@ Effect {
]
},
Technique {
- openGLFilter {
- api: OpenGLFilter.Desktop
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
majorVersion: 2
}
@@ -114,8 +114,8 @@ Effect {
]
},
Technique {
- openGLFilter {
- api: OpenGLFilter.ES
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGLES
majorVersion: 2
minorVersion: 0
}
diff --git a/examples/qt3d/planets-qml/PlanetShadowEffectD.qml b/examples/qt3d/planets-qml/PlanetShadowEffectD.qml
index 8698ca6ec..ea589f491 100644
--- a/examples/qt3d/planets-qml/PlanetShadowEffectD.qml
+++ b/examples/qt3d/planets-qml/PlanetShadowEffectD.qml
@@ -53,9 +53,9 @@ Effect {
techniques: [
Technique {
- openGLFilter {
- api: OpenGLFilter.Desktop
- profile: OpenGLFilter.Core
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
+ profile: GraphicsApiFilter.CoreProfile
majorVersion: 3
minorVersion: 2
}
@@ -103,8 +103,8 @@ Effect {
]
},
Technique {
- openGLFilter {
- api: OpenGLFilter.Desktop
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
majorVersion: 2
}
@@ -138,8 +138,8 @@ Effect {
]
},
Technique {
- openGLFilter {
- api: OpenGLFilter.ES
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGLES
majorVersion: 2
minorVersion: 0
}
diff --git a/examples/qt3d/plasma/main.qml b/examples/qt3d/plasma/main.qml
index 7f37ea344..1c4cb45ea 100644
--- a/examples/qt3d/plasma/main.qml
+++ b/examples/qt3d/plasma/main.qml
@@ -66,11 +66,11 @@ Entity {
effect: Effect {
techniques: Technique {
- openGLFilter {
+ graphicsApiFilter {
minorVersion: 3
majorVersion: 2
- api: OpenGLFilter.Desktop
- profile: OpenGLFilter.Core
+ api: GraphicsApiFilter.OpenGL
+ profile: GraphicsApiFilter.CoreProfile
}
renderPasses: RenderPass {
diff --git a/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml b/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml
index 172b7ade8..511c433bb 100644
--- a/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml
+++ b/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml
@@ -133,7 +133,7 @@ Material {
techniques : [
// OpenGL 3.1 Technique
Technique {
- openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.Core; minorVersion : 1; majorVersion : 3 }
+ graphicsApiFilter {api : GraphicsApiFilter.OpenGL; profile : GraphicsApiFilter.CoreProfile; minorVersion : 1; majorVersion : 3 }
annotations: [
Annotation { name : "RenderingStyle"; value : "forward"},
diff --git a/examples/qt3d/playground-qml/ComplexTechnique.qml b/examples/qt3d/playground-qml/ComplexTechnique.qml
index 6b4b3210c..f9d44249a 100644
--- a/examples/qt3d/playground-qml/ComplexTechnique.qml
+++ b/examples/qt3d/playground-qml/ComplexTechnique.qml
@@ -42,7 +42,7 @@ Technique {
Annotation { name : "RenderingStyle"; value : "forward"},
Annotation { name : "Enabled"; value : true}
]
- openGLFilter {api : OpenGLFilter.Desktop; profile : OpenGLFilter.Core; minorVersion : 1; majorVersion : 3 }
+ graphicsApiFilter {api : GraphicsApiFilter.OpenGL; profile : GraphicsApiFilter.CoreProfile; minorVersion : 1; majorVersion : 3 }
renderPasses : [
RenderPass {
annotations : [Annotation {name : "Name"; value : "TextureLighting" }]
diff --git a/examples/qt3d/shadow-map-qml/AdsEffect.qml b/examples/qt3d/shadow-map-qml/AdsEffect.qml
index 79d76232f..a965c94af 100644
--- a/examples/qt3d/shadow-map-qml/AdsEffect.qml
+++ b/examples/qt3d/shadow-map-qml/AdsEffect.qml
@@ -61,9 +61,9 @@ Effect {
techniques: [
Technique {
- openGLFilter {
- api: OpenGLFilter.Desktop
- profile: OpenGLFilter.Core
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
+ profile: GraphicsApiFilter.CoreProfile
majorVersion: 3
minorVersion: 2
}
@@ -107,8 +107,8 @@ Effect {
]
},
Technique {
- openGLFilter {
- api: OpenGLFilter.ES
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGLES
majorVersion: 3
minorVersion: 0
}
diff --git a/examples/qt3d/simple-shaders-qml/main.qml b/examples/qt3d/simple-shaders-qml/main.qml
index e92d0fe7e..ce83c01a9 100644
--- a/examples/qt3d/simple-shaders-qml/main.qml
+++ b/examples/qt3d/simple-shaders-qml/main.qml
@@ -93,11 +93,11 @@ Entity {
effect: Effect {
techniques: [
Technique {
- openGLFilter {
- api: OpenGLFilter.Desktop
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
majorVersion: 3
minorVersion: 2
- profile: OpenGLFilter.Core
+ profile: GraphicsApiFilter.CoreProfile
}
renderPasses: RenderPass {
@@ -173,11 +173,11 @@ Entity {
effect: Effect {
techniques: [
Technique {
- openGLFilter {
- api: OpenGLFilter.Desktop
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
majorVersion: 3
minorVersion: 2
- profile: OpenGLFilter.Core
+ profile: GraphicsApiFilter.CoreProfile
}
renderPasses: RenderPass {
diff --git a/examples/qt3d/skybox/Skybox.qml b/examples/qt3d/skybox/Skybox.qml
index 0bf560cce..0d69c3434 100644
--- a/examples/qt3d/skybox/Skybox.qml
+++ b/examples/qt3d/skybox/Skybox.qml
@@ -91,9 +91,9 @@ Entity {
techniques: [
// GL3 Technique
Technique {
- openGLFilter {
- api: OpenGLFilter.Desktop
- profile: OpenGLFilter.Core
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
+ profile: GraphicsApiFilter.CoreProfile
majorVersion: 3
minorVersion: 1
}
@@ -107,9 +107,9 @@ Entity {
}
},
Technique {
- openGLFilter {
- api: OpenGLFilter.Desktop
- profile: OpenGLFilter.None
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
+ profile: GraphicsApiFilter.NoProfile
majorVersion: 2
minorVersion: 0
}
@@ -122,9 +122,9 @@ Entity {
}
},
Technique {
- openGLFilter {
- api: OpenGLFilter.ES
- profile: OpenGLFilter.None
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGLES
+ profile: GraphicsApiFilter.NoProfile
majorVersion: 2
minorVersion: 0
}
diff --git a/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml b/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml
index 3ed399d51..f3cfb942c 100644
--- a/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml
+++ b/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml
@@ -59,9 +59,9 @@ Effect {
techniques: [
Technique {
- openGLFilter {
- api: OpenGLFilter.Desktop
- profile: OpenGLFilter.Core
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
+ profile: GraphicsApiFilter.CoreProfile
majorVersion: 4
minorVersion: 0
}
diff --git a/examples/qt3d/transparency-qml-scene3d/Scene.qml b/examples/qt3d/transparency-qml-scene3d/Scene.qml
index 6aac9a243..51cc79d7a 100644
--- a/examples/qt3d/transparency-qml-scene3d/Scene.qml
+++ b/examples/qt3d/transparency-qml-scene3d/Scene.qml
@@ -130,9 +130,9 @@ Entity {
techniques: [
Technique
{
- openGLFilter {
- api: OpenGLFilter.Desktop
- profile: OpenGLFilter.None
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
+ profile: GraphicsApiFilter.NoProfile
majorVersion: 2
minorVersion: 0
}
@@ -154,9 +154,9 @@ Entity {
},
Technique
{
- openGLFilter {
- api: OpenGLFilter.ES
- profile: OpenGLFilter.None
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGLES
+ profile: GraphicsApiFilter.NoProfile
majorVersion: 2
minorVersion: 0
}
diff --git a/examples/qt3d/transparency-qml/main.qml b/examples/qt3d/transparency-qml/main.qml
index f702bd2de..d9639f819 100644
--- a/examples/qt3d/transparency-qml/main.qml
+++ b/examples/qt3d/transparency-qml/main.qml
@@ -131,9 +131,9 @@ Entity {
techniques: [
Technique
{
- openGLFilter {
- api: OpenGLFilter.Desktop
- profile: OpenGLFilter.None
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
+ profile: GraphicsApiFilter.NoProfile
majorVersion: 2
minorVersion: 0
}
@@ -155,9 +155,9 @@ Entity {
},
Technique
{
- openGLFilter {
- api: OpenGLFilter.ES
- profile: OpenGLFilter.None
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGLES
+ profile: GraphicsApiFilter.NoProfile
majorVersion: 2
minorVersion: 0
}
diff --git a/examples/qt3d/wave/BackgroundEffect.qml b/examples/qt3d/wave/BackgroundEffect.qml
index ffd670d54..16b9670a9 100644
--- a/examples/qt3d/wave/BackgroundEffect.qml
+++ b/examples/qt3d/wave/BackgroundEffect.qml
@@ -42,9 +42,9 @@ Effect {
techniques: [
Technique {
- openGLFilter {
- api: OpenGLFilter.Desktop
- profile: OpenGLFilter.Core
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
+ profile: GraphicsApiFilter.CoreProfile
majorVersion: 3
minorVersion: 1
}
diff --git a/examples/qt3d/wave/WaveEffect.qml b/examples/qt3d/wave/WaveEffect.qml
index 58483a7d3..b83069163 100644
--- a/examples/qt3d/wave/WaveEffect.qml
+++ b/examples/qt3d/wave/WaveEffect.qml
@@ -57,9 +57,9 @@ Effect {
techniques: [
Technique {
- openGLFilter {
- api: OpenGLFilter.Desktop
- profile: OpenGLFilter.Core
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
+ profile: GraphicsApiFilter.CoreProfile
majorVersion: 3
minorVersion: 2
}
diff --git a/examples/qt3d/wireframe/WireframeEffect.qml b/examples/qt3d/wireframe/WireframeEffect.qml
index 653798428..b00e4cdc7 100644
--- a/examples/qt3d/wireframe/WireframeEffect.qml
+++ b/examples/qt3d/wireframe/WireframeEffect.qml
@@ -49,9 +49,9 @@ Effect {
techniques: [
Technique {
- openGLFilter {
- api: OpenGLFilter.Desktop
- profile: OpenGLFilter.Core
+ graphicsApiFilter {
+ api: GraphicsApiFilter.OpenGL
+ profile: GraphicsApiFilter.CoreProfile
majorVersion: 3
minorVersion: 1
}