From 89597eeba6e7a3418caa375f19f8dd303219881c Mon Sep 17 00:00:00 2001
From: Emil Velikov <emil.velikov@collabora.com>
Date: Thu, 18 Jul 2019 14:04:33 +0100
Subject: [PATCH] glamor_egl: remove unneeded xf86 includes/GLAMOR_FOR_XORG
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 glamor/glamor.h     | 4 ----
 glamor/glamor_egl.c | 3 ---
 2 files changed, 7 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);
 
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index 8821813f1..1661c3549 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -29,13 +29,10 @@
 
 #include "dix-config.h"
 
-#define GLAMOR_FOR_XORG
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <errno.h>
-#include <xf86.h>
-#include <xf86Priv.h>
 #include <xf86drm.h>
 #define EGL_DISPLAY_NO_X_MESA