diff options
author | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-11-03 10:29:17 +0100 |
---|---|---|
committer | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-11-03 14:24:05 +0000 |
commit | 0df2906ff79d7d43c0a96dd47d6be433cf006db9 (patch) | |
tree | 52becca52c0f906829dfacf1af1238546d54d09e /src/plugins/sceneparsers/gltf/gltfparser.cpp | |
parent | e35820a86b7fc61c8aafc266e9deb225b3d1c564 (diff) |
Rename QOpenGLFilter to QGraphicsApiFilter
This API change is part of an effort to remove anything specific to one
graphics API (in this case OpenGL) from the public APIs. In addition to
the name of the class being changed, the QGraphicsApiFilter::Api has
been refactored to reference the Graphics API, rather than an OpenGL
API. Now this list includes OpenGL, and OpenGLES, but could also include
Vulkan, DirectX, or any other graphics rendering API we wish to support
in the future. Right now the properties in this class are still
reflective of the OpenGL APIs, and may need to be extended with other
properties in the future for other rendering technologies.
The QGraphicsApiFilter::Profile enum has also been changed to be more
more clear. So for now there are enums NoProfile, CoreProfile, and
CompatibilityProfile.
Task-number:QTBUG-49078
Change-Id: Ib5f9c3b7adee5badec6bce8a12b23683eb43b4cb
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/plugins/sceneparsers/gltf/gltfparser.cpp')
-rw-r--r-- | src/plugins/sceneparsers/gltf/gltfparser.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/plugins/sceneparsers/gltf/gltfparser.cpp b/src/plugins/sceneparsers/gltf/gltfparser.cpp index 7fbbd7933..07399716f 100644 --- a/src/plugins/sceneparsers/gltf/gltfparser.cpp +++ b/src/plugins/sceneparsers/gltf/gltfparser.cpp @@ -63,7 +63,7 @@ #include <Qt3DRender/QGeometry> #include <Qt3DRender/QGeometryRenderer> #include <Qt3DRender/QMaterial> -#include <Qt3DRender/QOpenGLFilter> +#include <Qt3DRender/QGraphicsApiFilter> #include <Qt3DRender/QParameter> #include <Qt3DRender/QParameterMapping> #include <Qt3DRender/QPolygonOffset> @@ -492,10 +492,10 @@ QMaterial* GLTFParser::material(const QString &id) return NULL; } QTechnique *technique = m_techniques.value(techniqueName); - technique->openGLFilter()->setApi(QOpenGLFilter::ES); - technique->openGLFilter()->setMajorVersion(2); - technique->openGLFilter()->setMinorVersion(0); - technique->openGLFilter()->setProfile(QOpenGLFilter::None); + technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGLES); + technique->graphicsApiFilter()->setMajorVersion(2); + technique->graphicsApiFilter()->setMinorVersion(0); + technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile); //Optional Core technique @@ -508,10 +508,10 @@ QMaterial* GLTFParser::material(const QString &id) << "for material" << id << "in GLTF file" << m_basePath; } else { coreTechnique = m_techniques.value(coreTechniqueName); - coreTechnique->openGLFilter()->setApi(QOpenGLFilter::Desktop); - coreTechnique->openGLFilter()->setMajorVersion(3); - coreTechnique->openGLFilter()->setMinorVersion(1); - coreTechnique->openGLFilter()->setProfile(QOpenGLFilter::Core); + coreTechnique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL); + coreTechnique->graphicsApiFilter()->setMajorVersion(3); + coreTechnique->graphicsApiFilter()->setMinorVersion(1); + coreTechnique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::CoreProfile); } } //Optional GL2 technique @@ -522,10 +522,10 @@ QMaterial* GLTFParser::material(const QString &id) << "for material" << id << "in GLTF file" << m_basePath; } else { gl2Technique = m_techniques.value(gl2TechniqueName); - gl2Technique->openGLFilter()->setApi(QOpenGLFilter::Desktop); - gl2Technique->openGLFilter()->setMajorVersion(2); - gl2Technique->openGLFilter()->setMinorVersion(0); - gl2Technique->openGLFilter()->setProfile(QOpenGLFilter::None); + gl2Technique->graphicsApiFilter()->setApi(QGraphicsApiFilter::OpenGL); + gl2Technique->graphicsApiFilter()->setMajorVersion(2); + gl2Technique->graphicsApiFilter()->setMinorVersion(0); + gl2Technique->graphicsApiFilter()->setProfile(QGraphicsApiFilter::NoProfile); } } |