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>
This commit is contained in:
parent
f3ab3d0c61
commit
89597eeba6
|
@ -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);
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue