| 1 |
From 7c00af093b51175ef6b5d683dcdb5b14025fa867 Mon Sep 17 00:00:00 2001 |
| 2 |
From: Eric Engestrom <eric.engestrom@intel.com> |
| 3 |
Date: Thu, 10 Oct 2019 18:13:53 +0100 |
| 4 |
Subject: [PATCH 16/29] Revert "glx: Fix build errors with --enable-mangling |
| 5 |
(v2)" |
| 6 |
|
| 7 |
This reverts commit a27f2d991b1723c3349623401ce3c8f26dcdb28b. |
| 8 |
|
| 9 |
As of a0829cf23b307ca44ab8 ("GL: drop symbols mangling support"), this |
| 10 |
extra complexity isn't needed anymore. |
| 11 |
|
| 12 |
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com> |
| 13 |
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/2298> |
| 14 |
(cherry picked from commit 5dbbc0f0a824e4addffeb115631a9c5bcb426c29) |
| 15 |
--- |
| 16 |
.pick_status.json | 2 +- |
| 17 |
src/glx/glxextensions.h | 10 ++-------- |
| 18 |
2 files changed, 3 insertions(+), 9 deletions(-) |
| 19 |
|
| 20 |
diff --git a/.pick_status.json b/.pick_status.json |
| 21 |
index 74b8ea8603c..ba442c8aec4 100644 |
| 22 |
--- a/.pick_status.json |
| 23 |
+++ b/.pick_status.json |
| 24 |
@@ -1993,7 +1993,7 @@ |
| 25 |
"description": "Revert \"glx: Fix build errors with --enable-mangling (v2)\"", |
| 26 |
"nominated": true, |
| 27 |
"nomination_type": 2, |
| 28 |
- "resolution": 0, |
| 29 |
+ "resolution": 1, |
| 30 |
"main_sha": null, |
| 31 |
"because_sha": "a27f2d991b1723c3349623401ce3c8f26dcdb28b" |
| 32 |
}, |
| 33 |
diff --git a/src/glx/glxextensions.h b/src/glx/glxextensions.h |
| 34 |
index 999db335717..0af2db04e17 100644 |
| 35 |
--- a/src/glx/glxextensions.h |
| 36 |
+++ b/src/glx/glxextensions.h |
| 37 |
@@ -283,17 +283,11 @@ __glXEnableDirectExtension(struct glx_screen *psc, const char *name); |
| 38 |
/* GLX_ALIAS should be used for functions with a non-void return type. |
| 39 |
GLX_ALIAS_VOID is for functions with a void return type. */ |
| 40 |
# ifdef HAVE_FUNC_ATTRIBUTE_ALIAS |
| 41 |
-/* GLX_ALIAS and GLX_ALIAS_VOID both expand to the macro GLX_ALIAS2. Using the |
| 42 |
- * extra expansion means that the name mangling macros in glx_mangle.h will |
| 43 |
- * apply before stringification, so the alias attribute will have a string like |
| 44 |
- * "mglXFoo" instead of "glXFoo". */ |
| 45 |
-# define GLX_ALIAS2(return_type, real_func, proto_args, args, aliased_func) \ |
| 46 |
+# define GLX_ALIAS(return_type, real_func, proto_args, args, aliased_func) \ |
| 47 |
return_type real_func proto_args \ |
| 48 |
__attribute__ ((alias( # aliased_func ) )); |
| 49 |
-# define GLX_ALIAS(return_type, real_func, proto_args, args, aliased_func) \ |
| 50 |
- GLX_ALIAS2(return_type, real_func, proto_args, args, aliased_func) |
| 51 |
# define GLX_ALIAS_VOID(real_func, proto_args, args, aliased_func) \ |
| 52 |
- GLX_ALIAS2(void, real_func, proto_args, args, aliased_func) |
| 53 |
+ GLX_ALIAS(void, real_func, proto_args, args, aliased_func) |
| 54 |
# else |
| 55 |
# define GLX_ALIAS(return_type, real_func, proto_args, args, aliased_func) \ |
| 56 |
return_type real_func proto_args \ |
| 57 |
-- |
| 58 |
2.30.2 |
| 59 |
|
Parent Directory
| 
Revision Log