Commit 052b4c32 authored by Jeremy White's avatar Jeremy White Committed by Frediano Ziglio
Browse files

Provide compatibility for Glamor in Xorg 1.17.



In Xorg 1.18, X changed so that GLAMOR_USE_EGL_SCREEN was the only
flag required and it implies the behavior previously requested
with the GLAMOR_USE_SCREEN and GLAMORE_USE_PICTURE_SCREEN flags.
Thus, if we are building against an older Xorg, we need to specify
those now deprecated flags.

Additionally, the compat-api header conflicts with the older
glamor header file, so it needs to be moved to be included
after glamor.h.
Signed-off-by: Jeremy White's avatarJeremy White <jwhite@codeweavers.com>
Acked-by: Frediano Ziglio's avatarFrediano Ziglio <fziglio@redhat.com>
parent 9e6987c4
......@@ -11,11 +11,11 @@
#endif
#include <string.h>
#include "compat-api.h"
#define GLAMOR_FOR_XORG 1
#include "glamor.h"
#include "compat-api.h"
/* Supported chipsets */
typedef enum {
DUMMY_CHIP
......
......@@ -558,6 +558,19 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
int ret;
VisualPtr visual;
void *pixels;
int glamor_flags = GLAMOR_USE_EGL_SCREEN;
/* In Xorg 1.18, X changed so that GLAMOR_USE_EGL_SCREEN was the only
flag required and it implies the behavior previously requested
with the GLAMOR_USE_SCREEN and GLAMORE_USE_PICTURE_SCREEN flags.
Thus, if we are building against an older Xorg, we need to specify
those now deprecated flags. */
#if defined(GLAMOR_USE_SCREEN)
glamor_flags |= GLAMOR_USE_SCREEN;
#endif
#if defined(GLAMOR_USE_PICTURE_SCREEN)
glamor_flags |= GLAMOR_USE_PICTURE_SCREEN;
#endif
/*
* we need to get the ScrnInfoRec for this screen, so let's allocate
......@@ -618,7 +631,7 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
/* must be after RGB ordering fixed */
fbPictureInit(pScreen, 0, 0);
if (dPtr->glamor && !glamor_init(pScreen, GLAMOR_USE_EGL_SCREEN)) {
if (dPtr->glamor && !glamor_init(pScreen, glamor_flags)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Failed to initialise glamor at ScreenInit() time.\n");
return FALSE;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment