summaryrefslogtreecommitdiffstats
path: root/src/gui/opengl/qopenglfunctions_4_4_compatibility.h
diff options
context:
space:
mode:
authorHernan Martinez <hernan.c.martinez@gmail.com>2019-10-12 02:40:29 -0400
committerHernan Martinez <hernan.c.martinez@gmail.com>2019-10-21 09:14:18 -0400
commitb61c6164c100defc519b178d73858df59cffc48d (patch)
tree36c52d5c07704f143bfb415895da565371474fcb /src/gui/opengl/qopenglfunctions_4_4_compatibility.h
parenta9dcd772c032b5cb52f86e6cd898db3d3bc81023 (diff)
QtGui: Disable Windows on ARM64 preprocessor conflict in QtOpenGL
The Windows API MemoryBarrier function is actually a macro when _M_ARM64 is defined and it conflicts with the MemoryBarrier method when it's declared and used. Task-number: QTBUG-77388 Change-Id: I762edfc4ca1a44cbe095724de708c7cdad34ae65 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/gui/opengl/qopenglfunctions_4_4_compatibility.h')
-rw-r--r--src/gui/opengl/qopenglfunctions_4_4_compatibility.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/gui/opengl/qopenglfunctions_4_4_compatibility.h b/src/gui/opengl/qopenglfunctions_4_4_compatibility.h
index 7a05bd802d..0acab349a1 100644
--- a/src/gui/opengl/qopenglfunctions_4_4_compatibility.h
+++ b/src/gui/opengl/qopenglfunctions_4_4_compatibility.h
@@ -59,6 +59,12 @@
QT_BEGIN_NAMESPACE
+// MemoryBarrier is a macro on some architectures on Windows
+#ifdef Q_OS_WIN
+#pragma push_macro("MemoryBarrier")
+#undef MemoryBarrier
+#endif
+
class Q_GUI_EXPORT QOpenGLFunctions_4_4_Compatibility : public QAbstractOpenGLFunctions
{
public:
@@ -5961,6 +5967,10 @@ inline void QOpenGLFunctions_4_4_Compatibility::glVertexP2ui(GLenum type, GLuint
QT_END_NAMESPACE
+#ifdef Q_OS_WIN
+#pragma pop_macro("MemoryBarrier")
+#endif
+
#endif // QT_NO_OPENGL && !QT_OPENGL_ES_2
#endif