From 55ab6aacacb1d615e50e880697afc5771d99596c Mon Sep 17 00:00:00 2001
From: Corentin Wallez <cwallez@chromium.org>
Date: Fri, 14 Jun 2019 08:50:42 +0000
Subject: [PATCH] Fix compilation of the GL backend on Windows

The generated OpenGLFunctionsBase code uses the MemoryBarrier identifier
which is a macro defined in windows.h. Undefined it in
windows_with_undefs.

BUG=dawn:165

Change-Id: I6fcfef8fa14074e946d6c13536c1ae33b38c2ac2
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/8160
Reviewed-by: Jiawei Shao <jiawei.shao@intel.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
---
 src/common/windows_with_undefs.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/common/windows_with_undefs.h b/src/common/windows_with_undefs.h
index c4815464a6..e19552f30a 100644
--- a/src/common/windows_with_undefs.h
+++ b/src/common/windows_with_undefs.h
@@ -28,4 +28,7 @@
 // Macros defined for ANSI / Unicode support
 #undef GetMessage
 
+// Macros defined to produce compiler intrinsics
+#undef MemoryBarrier
+
 #endif  // COMMON_WINDOWS_WITH_UNDEFS_H_