From d26b122ee88dae51fb230ecb0987811eabd5046b Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 5 Sep 2018 17:35:13 +0100 Subject: [PATCH] dri/common: move the required GLX_* token definitions locally Will allow us to remove even bigger hack elsewhere. But more importantly, we should not be using _any_ GLX tokens in DRI. Document the gory details about the current side-effects. Signed-off-by: Emil Velikov Reviewed-by: Timothy Arceri --- src/mesa/drivers/dri/common/utils.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c index 9a518153dc8..5a66bcf8e05 100644 --- a/src/mesa/drivers/dri/common/utils.c +++ b/src/mesa/drivers/dri/common/utils.c @@ -41,6 +41,20 @@ #include "utils.h" #include "dri_util.h" +/* WARNING: HACK: Local defines to avoid pulling glx.h. + * + * Any parts of this file that use the following defines are either partial or + * entirely broken wrt EGL. + * + * For example any getConfigAttrib() or indexConfigAttrib() query from EGL for + * SLOW or NON_CONFORMANT_CONFIG will not work as expected since the EGL tokens + * are different from the GLX ones. + */ +#define GLX_NONE 0x8000 +#define GLX_SLOW_CONFIG 0x8001 +#define GLX_NON_CONFORMANT_CONFIG 0x800D +#define GLX_DONT_CARE 0xFFFFFFFF + /** * Create the \c GL_RENDERER string for DRI drivers. * -- 2.30.2