diff options
| -rw-r--r-- | src/quick3d/imports/render/qt3dquick3drenderplugin.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/quick3d/3drender/3drender.qml | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp index 3d1d248c3..98ac869c2 100644 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -112,6 +112,8 @@ #include <Qt3DRender/qviewport.h> #include <Qt3DRender/qproximityfilter.h> #include <Qt3DRender/qblitframebuffer.h> +#include <Qt3DRender/qsetfence.h> +#include <Qt3DRender/qwaitfence.h> #include <QtGui/qwindow.h> @@ -263,6 +265,8 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) Qt3DRender::Quick::registerExtendedType<Qt3DRender::QMemoryBarrier, Qt3DRender::Render::Quick::Quick3DMemoryBarrier>("QMemoryBarrier", "Qt3D.Render/MemoryBarrier", uri, 2, 9, "MemoryBarrier"); qmlRegisterType<Qt3DRender::QProximityFilter>(uri, 2, 10, "ProximityFilter"); qmlRegisterType<Qt3DRender::QBlitFramebuffer>(uri, 2, 10, "BlitFramebuffer"); + qmlRegisterType<Qt3DRender::QSetFence>(uri, 2, 13, "SetFence"); + qmlRegisterType<Qt3DRender::QWaitFence>(uri, 2, 13, "WaitFence"); // RenderTarget qmlRegisterType<Qt3DRender::QRenderTargetOutput>(uri, 2, 0, "RenderTargetOutput"); diff --git a/tests/auto/quick3d/3drender/3drender.qml b/tests/auto/quick3d/3drender/3drender.qml index 0fd038508..c20ce6c45 100644 --- a/tests/auto/quick3d/3drender/3drender.qml +++ b/tests/auto/quick3d/3drender/3drender.qml @@ -81,6 +81,8 @@ Item { //QQ3Render20.QAbstractTextureImage // (uncreatable) Qt3DRender::QAbstractTextureImage QQ3Render20.TextureImage {} //Qt3DRender::QTextureImage QQ3Render213.SharedGLTexture {} //Qt3DRender::QSharedGLTexture + QQ3Render213.WaitFence {} //Qt3DRender::QWaitFence + QQ3Render213.SetFence {} //Qt3DRender::QSetFence // Geometry QQ3Render20.Attribute {} //Qt3DRender::QAttribute |