diff options
| author | Jesse Natalie <jenatali@microsoft.com> | 2021-01-22 13:24:42 -0800 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-01-28 18:35:13 +0000 |
| commit | 92f1b6bad58833f45ae8daee18acd4d214399a06 (patch) | |
| tree | 3e9a3d25bc8cd8b8f9625158d496a0b12419de19 | |
| parent | 4656be70dd75adce5481394ddfc14edf31c068d8 (diff) | |
glapi: Undefine MemoryBarrier
Reviewed-by: Marek Olák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8661>
| -rw-r--r-- | src/mapi/glapi/gen/gl_apitemp.py | 4 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/gl_table.py | 4 |
2 files changed, 8 insertions, 0 deletions
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 |