diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-10-03 16:56:14 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2017-01-20 14:14:00 +0000 |
| commit | 2499faac0856a25735e403e9b174a005d565c23e (patch) | |
| tree | c4b439cc94abab3d23866164ae27ca1ae590ec8c /src/render/framegraph/framegraphnode_p.h | |
| parent | d874dd59ca7a11ef834cfbb26b68709973b17a48 (diff) | |
Add MemoryBarrier backend node
Change-Id: I029cc9e3fa0eb41f70ab88117aa40e7c738f1385
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/framegraph/framegraphnode_p.h')
| -rw-r--r-- | src/render/framegraph/framegraphnode_p.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/render/framegraph/framegraphnode_p.h b/src/render/framegraph/framegraphnode_p.h index 9f452ec78..ccdc47f12 100644 --- a/src/render/framegraph/framegraphnode_p.h +++ b/src/render/framegraph/framegraphnode_p.h @@ -60,6 +60,12 @@ #include <qglobal.h> #include <QVector> +// Windows had the smart idea of using a #define MemoryBarrier +// https://msdn.microsoft.com/en-us/library/windows/desktop/ms684208(v=vs.85).aspx +#if defined(Q_OS_WIN) && defined(MemoryBarrier) +#undef MemoryBarrier +#endif + QT_BEGIN_NAMESPACE namespace Qt3DRender { @@ -91,7 +97,8 @@ public: Lighting, ComputeDispatch, Surface, - RenderCapture + RenderCapture, + MemoryBarrier }; FrameGraphNodeType nodeType() const { return m_nodeType; } |