summaryrefslogtreecommitdiff
path: root/glamor/glamor.h
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.com>2019-07-18 14:04:33 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2019-10-11 12:03:42 +0000
commit89597eeba6e7a3418caa375f19f8dd303219881c (patch)
tree9c6009b8fcf79e3f2e89f88f7c1a7dc61fb56c28 /glamor/glamor.h
parentf3ab3d0c6123c8e7ddd3be6142f721590d153848 (diff)
glamor_egl: remove unneeded xf86 includes/GLAMOR_FOR_XORG
As of last commit, all of glamor_egl ix xf86 agnostic, so adjust the includes and drop the GLAMOR_FOR_XORG instances. Note the macro is still used for glamor_xv_init() which pulls xf86. v2: Drop GLAMOR_FOR_XORG guards (Michel Dänzer) Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'glamor/glamor.h')
-rw-r--r--glamor/glamor.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/glamor/glamor.h b/glamor/glamor.h
index d35364950..b83f1a0e8 100644
--- a/glamor/glamor.h
+++ b/glamor/glamor.h
@@ -334,8 +334,6 @@ extern _X_EXPORT Bool glamor_get_drawable_modifiers(DrawablePtr draw,
extern _X_EXPORT void glamor_set_drawable_modifiers_func(ScreenPtr screen,
GetDrawableModifiersFuncPtr func);
-#ifdef GLAMOR_FOR_XORG
-
#define GLAMOR_EGL_MODULE_NAME "glamoregl"
/* @glamor_egl_init: Initialize EGL environment.
@@ -398,8 +396,6 @@ extern _X_EXPORT Bool
struct gbm_bo *bo,
Bool used_modifiers);
-#endif
-
extern _X_EXPORT void glamor_egl_screen_init(ScreenPtr screen,
struct glamor_context *glamor_ctx);