Mesa (master): glapi: Undefine MemoryBarrier

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 92f1b6bad58833f45ae8daee18acd4d214399a06
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=92f1b6bad58833f45ae8daee18acd4d214399a06

Author: Jesse Natalie <jenatali at microsoft.com>
Date:   Fri Jan 22 13:24:42 2021 -0800

glapi: Undefine MemoryBarrier

Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8661>

---

 src/mapi/glapi/gen/gl_apitemp.py | 4 ++++
 src/mapi/glapi/gen/gl_table.py   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/mapi/glapi/gen/gl_apitemp.py b/src/mapi/glapi/gen/gl_apitemp.py
index d0583f48ef1..f4870be03b0 100644
--- a/src/mapi/glapi/gen/gl_apitemp.py
+++ b/src/mapi/glapi/gen/gl_apitemp.py
@@ -166,6 +166,10 @@ class PrintGlOffsets(gl_XML.gl_print_base):
 #error RETURN_DISPATCH must be defined
 #endif
 
+#ifdef MemoryBarrier
+#undef MemoryBarrier
+#endif
+
 """)
         return
 
diff --git a/src/mapi/glapi/gen/gl_table.py b/src/mapi/glapi/gen/gl_table.py
index cbd7cf5dbf7..e32139e6afa 100644
--- a/src/mapi/glapi/gen/gl_table.py
+++ b/src/mapi/glapi/gen/gl_table.py
@@ -64,6 +64,10 @@ class PrintGlTable(gl_XML.gl_print_base):
         print('extern "C" {')
         print('#endif')
         print('')
+        print('#ifdef MemoryBarrier')
+        print('#undef MemoryBarrier')
+        print('#endif')
+        print('')
         print('struct _glapi_table')
         print('{')
         return